From 36fdbc737076064e07568f9d2c872d2115101852 Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Fri, 25 Aug 2017 15:42:57 +0200 Subject: Increase size of //src/test/shell/integration:java_integration_test ...and re-enable of FreeBSD. It turns out that the timeout-flakyness was just because the CI machines weren't fast enough. Running the test 150 times showed no further timeout. Fixes #3614. Change-Id: Icdf2f91b1fe91e22117c3cf6d3fda9409d473198 PiperOrigin-RevId: 166470850 --- scripts/ci/bazel-tests.json | 3 +-- src/test/shell/integration/BUILD | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/ci/bazel-tests.json b/scripts/ci/bazel-tests.json index bbe6dc1b8e..d0a81d599e 100644 --- a/scripts/ci/bazel-tests.json +++ b/scripts/ci/bazel-tests.json @@ -59,8 +59,7 @@ "{} +" ], "tests": [ - // java_integration_test is timeout flaky on FreeBSD... - "//src/test/shell/integration/... - //src/test/shell/integration:java_integration_test", + "//src/test/shell/integration/...", "let bazel=\"//src/test/shell/bazel/...\" in $bazel - filter(\"all_tests\", $bazel) - filter(\"jdk\", $bazel) - filter(\"maven\", $bazel) - filter(\"android\", $bazel) - filter(\"java\", $bazel) - filter(\"workspace\", $bazel) - filter(\"external\", $bazel) - filter(\"example\", $bazel) - filter(\"skylark_repository\", $bazel) - filter(\"repository_cache\", $bazel)" ], "targets": [] diff --git a/src/test/shell/integration/BUILD b/src/test/shell/integration/BUILD index b4670ed90c..e3a534cc2b 100644 --- a/src/test/shell/integration/BUILD +++ b/src/test/shell/integration/BUILD @@ -62,7 +62,7 @@ sh_test( sh_test( name = "java_integration_test", - size = "medium", + size = "large", srcs = ["java_integration_test.sh"], args = ["$(JAVABASE)"], data = [ -- cgit v1.2.3