diff options
| author |  hlopko <hlopko@google.com> | 2017-08-01 22:26:37 +0200 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2017-08-02 10:40:10 +0200 |
| commit | 646cfd81793fc3b87979089aab873310d14e95e6 (patch) | |
| tree | 1178e4eebd43353445dc582e3024a42f85899f55 /src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java | |
| parent | 04304925be5cd767db834f442e3ef9f9d91ed4ff (diff) | |
Simplify copts handling and expose them as a build variable
This cl changes copts to be immutable (and changes addCopts methods into
setCopts, so it's simpler to reason about copts) and exposes copts as a build
variable. It also introduces CompileBuildVariablesTest, similar to
LinkBuildVariablesTest, to test that right build variables are exposed for right
actions.
RELNOTES: None.
PiperOrigin-RevId: 163876774
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java index 8695ac517a..f9f2664b7e 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java @@ -43,7 +43,6 @@ import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.packages.RuleClass; import com.google.devtools.build.lib.rules.ToolchainType; -import com.google.devtools.build.lib.testutil.MoreAsserts; import com.google.devtools.build.lib.util.FileType; import com.google.devtools.build.lib.util.OsUtils; import com.google.devtools.build.lib.vfs.FileSystemUtils; @@ -149,7 +148,7 @@ public class CcCommonTest extends BuildViewTestCase { "cc_library(name = 'c_lib',", " srcs = ['foo.cc'],", " copts = [ '-Wmy-warning', '-frun-faster' ])"); - MoreAsserts.assertContainsSublist(getCopts("//copts:c_lib"), "-Wmy-warning", "-frun-faster"); + assertThat(getCopts("//copts:c_lib")).containsAllOf("-Wmy-warning", "-frun-faster"); } @Test @@ -160,7 +159,7 @@ public class CcCommonTest extends BuildViewTestCase { " srcs = ['foo.cc'],", " copts = ['-Wmy-warning -frun-faster'])"); List<String> copts = getCopts("//copts:c_lib"); - MoreAsserts.assertContainsSublist(copts, "-Wmy-warning", "-frun-faster"); + assertThat(copts).containsAllOf("-Wmy-warning", "-frun-faster"); assertContainsEvent("each item in the list should contain only one option"); } @@ -173,7 +172,7 @@ public class CcCommonTest extends BuildViewTestCase { " srcs = ['foo.cc'],", " copts = ['-Wmy-warning -frun-faster'])"); List<String> copts = getCopts("//copts:c_lib"); - MoreAsserts.assertContainsSublist(copts, "-Wmy-warning -frun-faster"); + assertThat(copts).contains("-Wmy-warning -frun-faster"); } /** |