diff options
| author |  Tobias Werth <twerth@google.com> | 2016-09-12 14:51:51 +0000 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2016-09-12 17:09:26 +0000 |
| commit | 1971ea7ec8cc47ec09bbf62624f983dbcfbdee42 (patch) | |
| tree | 77c4801a5e3ac90a05064c0cfab1aeb4238b3240 /src | |
| parent | 0cfbcf8ac356ee681331c1b04290074f5d220d1f (diff) | |
Add trailing true after kill which does not have exit status 0.
Also increase timeout to reduce flakyness.
--
Change-Id: Ieb5bbd9b2f9e28cd3ec39f42deb0aba0f501171c
Reviewed-on: https://bazel-review.googlesource.com/c/6033/
MOS_MIGRATED_REVID=132873805
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/shell/integration/BUILD | 2 | ||||
| -rwxr-xr-x | src/test/shell/integration/startup_options_test.sh | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/test/shell/integration/BUILD b/src/test/shell/integration/BUILD index 0f4da1d7d2..b83da2bfa9 100644 --- a/src/test/shell/integration/BUILD +++ b/src/test/shell/integration/BUILD @@ -49,7 +49,7 @@ sh_test( sh_test( name = "startup_options_test", - size = "small", + size = "medium", srcs = ["startup_options_test.sh"], data = [":test-deps"], ) diff --git a/src/test/shell/integration/startup_options_test.sh b/src/test/shell/integration/startup_options_test.sh index eb22455b2d..1534ef1591 100755 --- a/src/test/shell/integration/startup_options_test.sh +++ b/src/test/shell/integration/startup_options_test.sh @@ -32,6 +32,7 @@ function test_different_startup_options() { [[ "$newpid" != "$pid" ]] || fail "pid $pid was the same!" kill -0 $pid 2> /dev/null && fail "$pid not dead" kill -0 $newpid 2> /dev/null && fail "$newpid not dead" + true } run_suite "bazel startup options test" |