diff --git a/dev-tools/eclipse/dot.classpath b/dev-tools/eclipse/dot.classpath
index 109fb19eefa..3f4f9477f41 100644
--- a/dev-tools/eclipse/dot.classpath
+++ b/dev-tools/eclipse/dot.classpath
@@ -170,6 +170,6 @@
-
+
diff --git a/dev-tools/idea/.idea/libraries/JUnit.xml b/dev-tools/idea/.idea/libraries/JUnit.xml
index 1494e44e7db..9f57955bb4b 100644
--- a/dev-tools/idea/.idea/libraries/JUnit.xml
+++ b/dev-tools/idea/.idea/libraries/JUnit.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index 40ac6c33f4f..aeb4bb457c3 100644
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@@ -383,7 +383,7 @@
com.carrotsearch.randomizedtesting
randomizedtesting-runner
- 1.5.0
+ 1.6.0
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 147a1c0c881..9fe70feea4c 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -42,6 +42,16 @@ Bug Fixes
Build
+* LUCENE-4094: Support overriding file.encoding on forked test JVMs
+ (force via -Drandomized.file.encoding=XXX). (Dawid Weiss)
+
+* LUCENE-4189: Test output should include timestamps (start/end for each
+ test/ suite). Added -Dtests.timestamps=[off by default]. (Dawid Weiss)
+
+* LUCENE-4110: Report long periods of forked jvm inactivity (hung tests/ suites).
+ Added -Dtests.heartbeat=[seconds] with the default of 60 seconds.
+ (Dawid Weiss)
+
* LUCENE-4160: Added a property to quit the tests after a given
number of failures has occurred. This is useful in combination
with -Dtests.iters=N (you can start N iterations and wait for M
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 12d28d34168..e20f2e6f830 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -18,7 +18,8 @@
-->
+ xmlns:ivy="antlib:org.apache.ivy.ant"
+ xmlns:junit4="antlib:com.carrotsearch.junit4">
This file is designed for importing into a main build file, and not intended
for standalone use.
@@ -107,6 +108,11 @@
+
+
+
+
+
@@ -675,7 +681,7 @@
-
+
@@ -684,7 +690,7 @@
-
+
@@ -739,11 +745,32 @@
-
+
-
+
+
+
+
+
+ US-ASCII
+ ISO-8859-1
+ UTF-8
+
+
+
+
+
+
@@ -825,17 +854,23 @@
+
+
+
+
+
+
-
+
-
+
-
-
-
-
+
-
-
+
+
@@ -898,29 +937,29 @@
-
+
5 slowest tests:
-
+
-
+
Showing ${max} slowest tests according to local stats. (change with -Dmax=...).
-
+
-
+
Showing ${max} slowest tests in cached stats. (change with -Dmax=...).
-
+
-
+
@@ -1021,6 +1060,12 @@ ant -Dtests.showSuccess=true test
# Display local averaged stats, if any (30 slowest tests).
ant test-times -Dmax=30
+# Display a timestamp alongside each suite/ test.
+ant -Dtests.timestamps=on ...
+
+# Override forked JVM file.encoding
+ant -Dtests.file.encoding=XXX ...
+
# Output test files and reports.
${tests-output}/tests-report.txt - full ASCII tests report
${tests-output}/tests-failures.txt - failures only (if any)
@@ -1031,12 +1076,12 @@ ${tests-output}/junit4-*.suites - per-JVM executed suites
-
+
-
+
diff --git a/lucene/core/src/java/org/apache/lucene/util/UnicodeUtil.java b/lucene/core/src/java/org/apache/lucene/util/UnicodeUtil.java
index 97082885964..afbe7c645ca 100644
--- a/lucene/core/src/java/org/apache/lucene/util/UnicodeUtil.java
+++ b/lucene/core/src/java/org/apache/lucene/util/UnicodeUtil.java
@@ -588,7 +588,7 @@ public final class UnicodeUtil {
out[out_offset++] = (char)(((b&0xf)<<12) + ((utf8[offset]&0x3f)<<6) + (utf8[offset+1]&0x3f));
offset += 2;
} else {
- assert b < 0xf8: "b=" + b;
+ assert b < 0xf8: "b = 0x" + Integer.toHexString(b);
int ch = ((b&0x7)<<18) + ((utf8[offset]&0x3f)<<12) + ((utf8[offset+1]&0x3f)<<6) + (utf8[offset+2]&0x3f);
offset += 3;
if (ch < UNI_MAX_BMP) {
diff --git a/lucene/ivy-settings.xml b/lucene/ivy-settings.xml
index 8c822860b07..97376ff9060 100644
--- a/lucene/ivy-settings.xml
+++ b/lucene/ivy-settings.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/lucene/test-framework/ivy.xml b/lucene/test-framework/ivy.xml
index 048651ec953..4e39a2b0a69 100644
--- a/lucene/test-framework/ivy.xml
+++ b/lucene/test-framework/ivy.xml
@@ -33,8 +33,8 @@
-
-
+
+
diff --git a/lucene/test-framework/lib/junit4-ant-1.5.0.jar.sha1 b/lucene/test-framework/lib/junit4-ant-1.5.0.jar.sha1
deleted file mode 100644
index 05060d23b34..00000000000
--- a/lucene/test-framework/lib/junit4-ant-1.5.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4e920288c2d2cd39b7e15f3abcaa3c5e2213ec9c
diff --git a/lucene/test-framework/lib/junit4-ant-1.6.0.jar.sha1 b/lucene/test-framework/lib/junit4-ant-1.6.0.jar.sha1
new file mode 100644
index 00000000000..9a2ca8031bc
--- /dev/null
+++ b/lucene/test-framework/lib/junit4-ant-1.6.0.jar.sha1
@@ -0,0 +1 @@
+c7a65e96a2c62ba83ca404065305aec5dc7fc8f1
diff --git a/lucene/test-framework/lib/randomizedtesting-runner-1.5.0.jar.sha1 b/lucene/test-framework/lib/randomizedtesting-runner-1.5.0.jar.sha1
deleted file mode 100644
index 380e2fe560d..00000000000
--- a/lucene/test-framework/lib/randomizedtesting-runner-1.5.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-378731cc7f26d45b68a6e5f600d4c7d071d165b1
diff --git a/lucene/test-framework/lib/randomizedtesting-runner-1.6.0.jar.sha1 b/lucene/test-framework/lib/randomizedtesting-runner-1.6.0.jar.sha1
new file mode 100644
index 00000000000..be7ad328535
--- /dev/null
+++ b/lucene/test-framework/lib/randomizedtesting-runner-1.6.0.jar.sha1
@@ -0,0 +1 @@
+709f9549a0b0c2e2ecdd5af012d9531325d6551b
diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java b/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java
index 7c60d766e6d..ce84ae9ee5c 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java
@@ -160,8 +160,8 @@ public final class RunListenerPrintReproduceInfo extends RunListener {
addVmOpt(b, "tests.timezone", classEnvRule.timeZone.getID());
}
}
- // Randomize this: LUCENE-4094
- addVmOpt(b, "args", "-Dfile.encoding=" + System.getProperty("file.encoding"));
+
+ addVmOpt(b, "randomized.file.encoding", System.getProperty("file.encoding"));
System.err.println(b.toString());
}