diff options
| author | Jonathan Nieder <jrn@google.com> | 2018-05-02 15:23:31 -0700 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2018-05-08 10:18:37 +0900 |
| commit | 6efedb41c6fe3fc6eb88f49afc3e7f481514e806 (patch) | |
| tree | 60a9290f8f9af2dc8c250f708d8e5ba0dc172cb5 /org.eclipse.jgit.test | |
| parent | 5f2ddc8ac0528f2fc9776be822568dff3f065670 (diff) | |
| download | jgit-6efedb41c6fe3fc6eb88f49afc3e7f481514e806.tar.gz jgit-6efedb41c6fe3fc6eb88f49afc3e7f481514e806.zip | |
Mark CrissCrossMergeTest as flaky
It often fails on my machine, both in maven and bazel.
This patch marks the test flaky[1] in bazel so that "bazel test" can
run it a few times before declaring failure.
[1] https://docs.bazel.build/versions/master/be/common-definitions.html#test.flaky
Bug: 534285
Change-Id: Ibe5414fefbffe4e8f86af7047608d51cf5df5c47
Diffstat (limited to 'org.eclipse.jgit.test')
| -rw-r--r-- | org.eclipse.jgit.test/tests.bzl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/org.eclipse.jgit.test/tests.bzl b/org.eclipse.jgit.test/tests.bzl index 637fe0c9c3..b1b7b7a9de 100644 --- a/org.eclipse.jgit.test/tests.bzl +++ b/org.eclipse.jgit.test/tests.bzl @@ -19,6 +19,10 @@ def tests(tests): if 'lib' not in labels: labels.append('lib') + # TODO(http://eclip.se/534285): Make this test pass reliably + # and remove the flaky attribute. + flaky = src.endswith("CrissCrossMergeTest.java") + additional_deps = [] if src.endswith("RootLocaleTest.java"): additional_deps = [ @@ -52,5 +56,6 @@ def tests(tests): '//org.eclipse.jgit.junit:junit', '//org.eclipse.jgit.lfs:jgit-lfs', ], + flaky = flaky, jvm_flags = ["-Xmx256m", "-Dfile.encoding=UTF-8"], ) |