--- old/test/compiler/intrinsics/bmi/BMITestRunner.java 2014-10-28 19:58:51.907457463 +0300 +++ new/test/compiler/intrinsics/bmi/BMITestRunner.java 2014-10-28 19:58:51.503457451 +0300 @@ -22,13 +22,17 @@ * */ -import java.util.*; +import com.oracle.java.testlibrary.Asserts; +import com.oracle.java.testlibrary.OutputAnalyzer; +import com.oracle.java.testlibrary.ProcessTools; +import com.oracle.java.testlibrary.Utils; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; -import java.nio.charset.StandardCharsets; - -import com.oracle.java.testlibrary.*; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Random; /** * Test runner that invokes all methods implemented by particular Expr @@ -69,7 +73,7 @@ String... additionalVMOpts) throws Throwable { - int seed = new Random().nextInt(); + int seed = Utils.getRandomInstance().nextInt(); int iterations = DEFAULT_ITERATIONS_COUNT; for (String testOption : testOpts) { @@ -81,8 +85,6 @@ } } - System.out.println("Running test with seed: " + seed); - OutputAnalyzer intOutput = runTest(expr, VMMode.INT, additionalVMOpts, seed, iterations); @@ -139,9 +141,9 @@ Collections.addAll(vmOpts, new String[] { "-XX:+DisplayVMOutputToStderr", + "-D" + Utils.SEED_PROPERTY_NAME + "=" + seed, Executor.class.getName(), expr.getName(), - new Integer(seed).toString(), new Integer(iterations).toString() }); @@ -179,16 +181,15 @@ public static class Executor { /** - * Usage: BMITestRunner$Executor + * Usage: BMITestRunner$Executor <ExprClassName> <iterations> */ public static void main(String args[]) throws Exception { @SuppressWarnings("unchecked") Class exprClass = (Class)Class.forName(args[0]); Expr expr = exprClass.getConstructor().newInstance(); - Random rng = new Random(Integer.valueOf(args[1])); - int iterations = Integer.valueOf(args[2]); - runTests(expr, iterations, rng); + int iterations = Integer.valueOf(args[1]); + runTests(expr, iterations, Utils.getRandomInstance()); }