diff options
| author |  Seth Greenstein <sgreens@google.com> | 2017-11-29 02:29:27 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-11-29 02:31:23 -0800 |
| commit | 91420101cf977990166acec2a0e46e1787389512 (patch) | |
| tree | 153e84209a67c93f56294f158f43c99ee043d901 /tools/test | |
| parent | f84650c28c760a3cec0612dd6ac5b9b34b6aa76e (diff) | |
Handle spaces in absolute paths to tests.
This allows for output_base paths that contain spaces, fixing #3897
The test path is set by grepping the MANIFEST, in which each line is a
space-separated 2-tuple of relative path and absolute path to the test.
Replace the awk command that extracts the second item in the
space-separated list with a sed command that extracts everything after the
first space. Also, quote the manifest path arg to the grep command.
There will still be problems if there are spaces in the relative path,
below the Bazel project root.
Test: Built and tested a test with an output_base containing a space.
Change-Id: I5dba285bb50c27eedace17a5e20efac7392a9a6e
Closes #3899.
Change-Id: I5dba285bb50c27eedace17a5e20efac7392a9a6e
PiperOrigin-RevId: 177283695
Diffstat (limited to 'tools/test')
| -rwxr-xr-x | tools/test/test-setup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/test/test-setup.sh b/tools/test/test-setup.sh index 3e357045e9..a61e0c7007 100755 --- a/tools/test/test-setup.sh +++ b/tools/test/test-setup.sh @@ -117,7 +117,7 @@ else if is_absolute "$1" ; then echo "$1" else - echo $(grep "^$1 " $RUNFILES_MANIFEST_FILE | awk '{ print $2 }') + echo $(grep "^$1 " "${RUNFILES_MANIFEST_FILE}" | sed 's/[^ ]* //') fi } fi |