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/shell/integration | |
| 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/shell/integration')
| -rwxr-xr-x | src/test/shell/integration/runfiles_test.sh | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/test/shell/integration/runfiles_test.sh b/src/test/shell/integration/runfiles_test.sh index f8824fba11..ef1faf0cf6 100755 --- a/src/test/shell/integration/runfiles_test.sh +++ b/src/test/shell/integration/runfiles_test.sh @@ -140,15 +140,9 @@ EOF assert_equals 13 $(wc -l < MANIFEST) for i in $(find ${WORKSPACE_NAME} \! -type d); do - if readlink "$i" > /dev/null; then - echo "$i $(readlink "$i")" >> ${TEST_TMPDIR}/MANIFEST2 - else - echo "$i " >> ${TEST_TMPDIR}/MANIFEST2 - fi - done - sort MANIFEST > ${TEST_TMPDIR}/MANIFEST_sorted - sort ${TEST_TMPDIR}/MANIFEST2 > ${TEST_TMPDIR}/MANIFEST2_sorted - diff -u ${TEST_TMPDIR}/MANIFEST_sorted ${TEST_TMPDIR}/MANIFEST2_sorted + echo "$i $(readlink "$i")" + done >MANIFEST2 + diff -u <(sort MANIFEST) <(sort MANIFEST2) } function test_workspace_name_change() { |