aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Stephen Twigg <twigg@google.com>2017-04-05 12:46:40 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2017-04-05 15:24:24 +0200
commitb13457b1434d64ab187fb511e73f01d1f2321c1e (patch)
treeb7387b10530abbc88f69f2fd0a0a0ebad939d02e /src
parentd31eab12024751866ba590f941cabe535b7b9bc3 (diff)
Small shell fixed to cleanup distfile testing
Fix permissions issue in testenv.sh to clarified chmod on tools/jdk/BUILD when copying tools into new workspace: Original script always tried to append but only set it to be writable after the copy when extra BUILD.* files were available. Exported is_absolute in test-setup.sh: rlocation, which is called by tests to properly locate bazel, itself calls is_absolute. This would generally cause a (presumably recoverable) error since most tests continue to call a bazel properly. However, tests that are inspecting the error log will fail due to the message error. Note, that not all tests pass yet. Also getting an issue with: * scripts/release/testenv.sh : line 38 (file doesn't exist) * in test_delete_tree_in_unwritable_dir, "fails on first compilation: due to mkdir: cannot create directory 'bazel-out/local-fastbuild/genfiles/x/unwritable/somedir' * test_run_under_path 'occasionally' fails to fail (bazel_test_test.sh:197) Change-Id: I957a346d320070a310dee4076cc9349ed1e140e1 PiperOrigin-RevId: 152247475
Diffstat (limited to 'src')
-rwxr-xr-xsrc/test/shell/testenv.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh
index b3ed2aec73..9562970fda 100755
--- a/src/test/shell/testenv.sh
+++ b/src/test/shell/testenv.sh
@@ -162,6 +162,8 @@ function copy_tools_directory() {
# tools/jdk/BUILD file for JDK 7 is generated.
if [ -f tools/jdk/BUILD.* ]; then
cp tools/jdk/BUILD.* tools/jdk/BUILD
+ fi
+ if [ -f tools/jdk/BUILD ]; then
chmod +w tools/jdk/BUILD
fi
# To support custom langtools