Merge branch 'stable-7.9' * stable-7.9: Prepare 7.9.0-SNAPSHOT builds JGit v7.9.0.202610071003-m1 Change-Id: I0abffd0d92c92e09b1cf01a5cf7576e102f493af
diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ArchiveTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ArchiveTest.java index 1fc898d..89d0bda 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ArchiveTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ArchiveTest.java
@@ -561,6 +561,8 @@ private Process spawnAssumingCommandPresent(String... cmdline) { ProcessBuilder procBuilder = new ProcessBuilder(cmdline) .directory(cwd) .redirectErrorStream(true); + procBuilder.environment().put("LC_ALL", "C"); + procBuilder.environment().put("LANG", "C"); Process proc = null; try { proc = procBuilder.start();
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/InterruptTimerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/InterruptTimerTest.java index 80419f7..bfe4830 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/InterruptTimerTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/InterruptTimerTest.java
@@ -21,11 +21,11 @@ import org.junit.Test; public class InterruptTimerTest { - private static final int MULTIPLIER = 8; // Increase if tests get flaky - private static final int BUFFER = 5; // Increase if tests get flaky - private static final int REPEATS = 100; // Increase to stress test more + private static final int MULTIPLIER = 10; // Increase if tests get flaky + private static final int BUFFER = 100; // Increase if tests get flaky + private static final int REPEATS = 20; // Increase to stress test more - private static final int SHORT_ENOUGH = 1; + private static final int SHORT_ENOUGH = 10; private static final int TOO_LONG = SHORT_ENOUGH * MULTIPLIER + BUFFER; private static final int TIMEOUT_LONG_ENOUGH = TOO_LONG; private static final int TIMEOUT_TOO_SHORT = SHORT_ENOUGH;