Mercurial > hg > truffle

changeset 18334:0950fa8782c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mx: ignore --fail-fast option to unittest if a single test method is specified
author Doug Simon <doug.simon@oracle.com>
date Tue, 11 Nov 2014 10:48:27 +0100
parents db6b7d3dfa1d
children 636d3aa761e4
files graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalJUnitCore.java
diffstat 1 files changed, 21 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalJUnitCore.java	Tue Nov 11 10:06:24 2014 +0100
+++ b/graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalJUnitCore.java	Tue Nov 11 10:48:27 2014 +0100
@@ -135,27 +135,30 @@
         Request request;
         if (methodName == null) {
             request = Request.classes(classes.toArray(new Class[0]));
+            if (failFast) {
+                Runner runner = request.getRunner();
+                if (runner instanceof ParentRunner) {
+                    ParentRunner<?> parentRunner = (ParentRunner<?>) runner;
+                    parentRunner.setScheduler(new RunnerScheduler() {
+                        public void schedule(Runnable childStatement) {
+                            if (textListener.getLastFailure() == null) {
+                                childStatement.run();
+                            }
+                        }
+
+                        public void finished() {
+                        }
+                    });
+                } else {
+                    system.out().println("Unexpected Runner subclass " + runner.getClass().getName() + " - fail fast not supported");
+                }
+            }
         } else {
+            if (failFast) {
+                system.out().println("Single method selected - fail fast not supported");
+            }
             request = Request.method(classes.get(0), methodName);
         }
-        if (failFast) {
-            Runner runner = request.getRunner();
-            if (runner instanceof ParentRunner) {
-                ParentRunner<?> parentRunner = (ParentRunner<?>) runner;
-                parentRunner.setScheduler(new RunnerScheduler() {
-                    public void schedule(Runnable childStatement) {
-                        if (textListener.getLastFailure() == null) {
-                            childStatement.run();
-                        }
-                    }
-
-                    public void finished() {
-                    }
-                });
-            } else {
-                system.out().println("Unexpected Runner subclass " + runner.getClass().getName() + " - fail fast not supported");
-            }
-        }
         Result result = junitCore.run(request);
         for (Failure each : missingClasses) {
             result.getFailures().add(each);