diff options
| author |  kchodorow <kchodorow@google.com> | 2017-04-22 15:07:22 -0400 |
|---|---|---|
| committer | Kristina Chodorow <kchodorow@google.com> | 2017-05-23 15:37:55 -0400 |
| commit | 85ae1905d4abfcd214bd53d6cd3d032ff246daf6 (patch) | |
| tree | 38b2220246c55d721cfc8f7d3c6940b154c4b649 /src/test/java/com/google/devtools/build/lib/analysis/config | |
| parent | e7e561850428638c7e919eb1cfc850e71748b6dc (diff) | |
Automated g4 rollback of commit c4134802dd15d6ef5cca6521f6bf6aac395ee2ad.
*** Reason for rollback ***
Roll forward of directory name change
*** Original change description ***
Automated g4 rollback of commit 1d9e1ac90197b1d3d7b137ba3c1ada67bb9ba31b.
*** Reason for rollback ***
Breaks //src/test/shell/integration:force_delete_output_test
*** Original change description ***
Symlink output directories to the correct directory name
If the workspace directory is /path/to/my/proj and the name in the WORKSPACE
file is "floop", this will symlink the output directories to
output_base/execroot/floop instead of output_base/execroot/proj.
More prep for #1262, fixes #1681.
PiperOrigin-RevId: 156892980
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 | 6 |
1 files changed, 4 insertions, 2 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 fe17b4773a..7678314870 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 @@ -52,7 +52,8 @@ public class BuildConfigurationTest extends ConfigurationTestCase { BuildConfiguration config = create("--cpu=piii"); String outputDirPrefix = outputBase - + "/workspace/blaze-out/gcc-4.4.0-glibc-2.3.6-grte-piii-fastbuild"; + + "/" + config.getMainRepositoryName() + + "/blaze-out/gcc-4.4.0-glibc-2.3.6-grte-piii-fastbuild"; assertEquals(outputDirPrefix, config.getOutputDirectory(RepositoryName.MAIN).getPath().toString()); @@ -73,7 +74,8 @@ public class BuildConfigurationTest extends ConfigurationTestCase { } BuildConfiguration config = create("--platform_suffix=-test"); - assertEquals(outputBase + "/workspace/blaze-out/gcc-4.4.0-glibc-2.3.6-grte-k8-fastbuild-test", + assertEquals(outputBase + "/" + config.getMainRepositoryName() + + "/blaze-out/gcc-4.4.0-glibc-2.3.6-grte-k8-fastbuild-test", config.getOutputDirectory(RepositoryName.MAIN).getPath().toString()); } |