diff options
| author |  lberki <lberki@google.com> | 2017-07-24 10:35:18 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-07-24 13:17:56 +0200 |
| commit | 46880398aced488932651d4fd0aa86753d8d1144 (patch) | |
| tree | ed66950833206b3ac0d8b20036cd8ac74c28cf49 /src/test/java/com/google/devtools/build/lib/analysis/config | |
| parent | 45ae096f3897e164a28a0cb1da9e20c9f523fc9c (diff) | |
Make all our tests pass with --noexperimental_toolchain_id_in_output_directory.
RELNOTES: None.
PiperOrigin-RevId: 162906513
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis/config')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java index 4dd467cc6c..4374c86330 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java @@ -48,17 +48,16 @@ public class BuildConfigurationTest extends ConfigurationTestCase { BuildConfiguration config = create("--cpu=piii"); String outputDirPrefix = outputBase - + "/" + config.getMainRepositoryName() - + "/blaze-out/gcc-4.4.0-glibc-2.3.6-grte-piii-fastbuild"; + + "/" + config.getMainRepositoryName() + "/blaze-out/.*piii-fastbuild"; assertThat(config.getOutputDirectory(RepositoryName.MAIN).getPath().toString()) - .isEqualTo(outputDirPrefix); + .matches(outputDirPrefix); assertThat(config.getBinDirectory(RepositoryName.MAIN).getPath().toString()) - .isEqualTo(outputDirPrefix + "/bin"); + .matches(outputDirPrefix + "/bin"); assertThat(config.getIncludeDirectory(RepositoryName.MAIN).getPath().toString()) - .isEqualTo(outputDirPrefix + "/include"); + .matches(outputDirPrefix + "/include"); assertThat(config.getTestLogsDirectory(RepositoryName.MAIN).getPath().toString()) - .isEqualTo(outputDirPrefix + "/testlogs"); + .matches(outputDirPrefix + "/testlogs"); } @Test @@ -69,11 +68,11 @@ public class BuildConfigurationTest extends ConfigurationTestCase { BuildConfiguration config = create("--platform_suffix=-test"); assertThat(config.getOutputDirectory(RepositoryName.MAIN).getPath().toString()) - .isEqualTo( + .matches( outputBase + "/" + config.getMainRepositoryName() - + "/blaze-out/gcc-4.4.0-glibc-2.3.6-grte-k8-fastbuild-test"); + + "/blaze-out/.*k8-fastbuild-test"); } @Test |