diff options
| author |  dmarting <dmarting@google.com> | 2017-07-20 12:45:20 +0200 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2017-07-20 13:07:14 +0200 |
| commit | 1711276d95f398a89ac501190f2158bcbb46b4dd (patch) | |
| tree | 290450a0b4142665d7166402dc63246ab4c8dadf /src | |
| parent | c3e0660bf8d5c6e32ae817f8a3f52c7fc6bf039e (diff) | |
Automated rollback of commit b8514f533d4546d3bfbec3700012f2bbeffd1c37.
*** Reason for rollback ***
Breaks XML format when there is weird characters in the output (Jenkins fails to read XML output for re2 test)
*** Original change description ***
Add stdout to default XML file and generate XML file on timeout
This should fix #1027 and get better error result on Jenkins.
Change-Id: I5ce30b64f634e01dd350af10748c4a9455a6bea8
PiperOrigin-RevId: 162598130
Diffstat (limited to 'src')
| -rwxr-xr-x | src/test/shell/bazel/bazel_test_test.sh | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/src/test/shell/bazel/bazel_test_test.sh b/src/test/shell/bazel/bazel_test_test.sh index 10cf7fa9f2..8608147764 100755 --- a/src/test/shell/bazel/bazel_test_test.sh +++ b/src/test/shell/bazel/bazel_test_test.sh @@ -300,33 +300,6 @@ EOF [ -s $xml_log ] || fail "$xml_log was not present after test" } -# Tests that the test.xml is here in case of timeout -function test_xml_is_present_when_timingout() { - mkdir -p dir - - cat <<'EOF' > dir/test.sh -#!/bin/sh -sleep 10 -EOF - - chmod +x dir/test.sh - - cat <<'EOF' > dir/BUILD - sh_test( - name = "test", - srcs = [ "test.sh" ], - ) -EOF - - bazel test -s --test_timeout=1 \ - //dir:test &> $TEST_log && fail "should have failed" || true - - xml_log=bazel-testlogs/dir/test/test.xml - [ -s "${xml_log}" ] || fail "${xml_log} was not present after test" - cat "${xml_log}" > $TEST_log - expect_log '"Timed out"' -} - # Check that fallback xml output is correctly generated for sharded tests. function test_xml_fallback_for_sharded_test() { mkdir -p dir |