Repository: kudu Updated Branches: refs/heads/master e6aedc99d -> 74dc5da86
Fix RUN_FLAKY_ONLY build Now that our tests have shard numbers appended (foo-test.<shard>) according to ctest, the RUN_FLAKY_ONLY build regex was no longer applying properly. It was converting the flaky test 'foo-test' to the regex '^foo-test$' which would not match any of the shards. This simply removes the '$' from the end of the regex. I attempted to instead add a '(.\d+)?' to the regex, but ctest has a hard limit on the number of '()' pairs in a regex so it was failing to compile the regex. It's also not possible to pass multiple separate regexes on the command line. Given that we never have test names where one is a prefix of another, I think this is probably fine. Change-Id: I3574bb88c2f3c465e3c659b80b122c1109053648 Reviewed-on: http://gerrit.cloudera.org:8080/9533 Reviewed-by: Adar Dembo <a...@cloudera.com> Tested-by: Kudu Jenkins Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/74dc5da8 Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/74dc5da8 Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/74dc5da8 Branch: refs/heads/master Commit: 74dc5da86ab2e5c8bfe524599d4a9e7a04d3cd27 Parents: e6aedc9 Author: Todd Lipcon <t...@apache.org> Authored: Wed Mar 7 11:51:19 2018 -0800 Committer: Todd Lipcon <t...@apache.org> Committed: Wed Mar 7 20:17:15 2018 +0000 ---------------------------------------------------------------------- build-support/jenkins/build-and-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/74dc5da8/build-support/jenkins/build-and-test.sh ---------------------------------------------------------------------- diff --git a/build-support/jenkins/build-and-test.sh b/build-support/jenkins/build-and-test.sh index 66cc2ae..12a2460 100755 --- a/build-support/jenkins/build-and-test.sh +++ b/build-support/jenkins/build-and-test.sh @@ -307,7 +307,7 @@ if [ "$RUN_FLAKY_ONLY" == "1" ] ; then fi test_regex=$(perl -e ' chomp(my @lines = <>); - print join("|", map { "^" . quotemeta($_) . "\$" } @lines); + print join("|", map { "^" . quotemeta($_) } @lines); ' $BUILD_ROOT/flaky-tests.txt) if [ -z "$test_regex" ]; then echo No tests are flaky.