diff options
| author |  Laszlo Csomor <laszlocsomor@google.com> | 2018-01-29 03:26:34 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-29 03:28:36 -0800 |
| commit | 8130287c0a921816ada6aa95eb968c1d8e6c1b0f (patch) | |
| tree | 116e173a64c75fc36cb16de4c94814639ee6edaa /tools/test | |
| parent | dd832322dabe653ada1bb2332e2a8d2ae0bfbfd9 (diff) | |
windows,test: add logging to bootstrap test
Add logging to bazel_bootstrap_distfile_test in
case it is running on Windows. The logging will
help collect basic performance stats.
Also remove the %N placeholder from `date` format
string in the log messages, because macOS doesn't
support it.
See https://github.com/bazelbuild/bazel/issues/4503
Change-Id: Idf00bf1512d02a793b27e1cc761fbcd630e79618
PiperOrigin-RevId: 183642578
Diffstat (limited to 'tools/test')
| -rwxr-xr-x | tools/test/test-setup.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/test/test-setup.sh b/tools/test/test-setup.sh index 3b7ce2db31..aa6f7223b8 100755 --- a/tools/test/test-setup.sh +++ b/tools/test/test-setup.sh @@ -105,12 +105,12 @@ GUNIT_OUTPUT="xml:${XML_OUTPUT_FILE}" RUNFILES_MANIFEST_FILE="${TEST_SRCDIR}/MANIFEST" -if [ -z "$RUNFILES_MANIFEST_ONLY" ]; then +if [[ "${RUNFILES_MANIFEST_ONLY:-}" != "1" ]]; then function rlocation() { if is_absolute "$1" ; then echo "$1" else - echo "$(dirname $RUNFILES_MANIFEST_FILE)/$1" + echo "$TEST_SRCDIR/$1" fi } else @@ -118,7 +118,7 @@ else if is_absolute "$1" ; then echo "$1" else - echo $(grep "^$1 " "${RUNFILES_MANIFEST_FILE}" | sed 's/[^ ]* //') + echo "$(grep "^$1 " "${RUNFILES_MANIFEST_FILE}" | sed 's/[^ ]* //')" fi } fi |