diff options
| author |  hlopko <hlopko@google.com> | 2017-04-04 13:53:14 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-04-04 18:38:24 +0200 |
| commit | c4134802dd15d6ef5cca6521f6bf6aac395ee2ad (patch) | |
| tree | bcb3f28c5a4357f0089c2c71b738d63a748ef788 /src/test/java/com/google/devtools/build/lib/analysis/config | |
| parent | 64f80799ed5c6369ffb6814f939a7964b0fa7c49 (diff) | |
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: 152126545
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, 2 insertions, 4 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 b68e2add53..d273f8c0f4 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 @@ -50,8 +50,7 @@ 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"; + + "/workspace/blaze-out/gcc-4.4.0-glibc-2.3.6-grte-piii-fastbuild"; assertEquals(outputDirPrefix, config.getOutputDirectory(RepositoryName.MAIN).getPath().toString()); @@ -72,8 +71,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase { } BuildConfiguration config = create("--platform_suffix=-test"); - assertEquals(outputBase + "/" + config.getMainRepositoryName() - + "/blaze-out/gcc-4.4.0-glibc-2.3.6-grte-k8-fastbuild-test", + assertEquals(outputBase + "/workspace/blaze-out/gcc-4.4.0-glibc-2.3.6-grte-k8-fastbuild-test", config.getOutputDirectory(RepositoryName.MAIN).getPath().toString()); } |