# HG changeset patch
# User Josef Eisl <josef.eisl@jku.at>
# Date 1400093967 -7200
# Node ID fcf6e56830828cdccfefbf914f53a636db041a80
# Parent  ec29b2d3bdb4f381b7c889cd9680ba337e62ca73
mx unittest: add --eager-stacktrace.

diff -r ec29b2d3bdb4 -r fcf6e5683082 graal/com.oracle.graal.test/src/com/oracle/graal/test/EagerStackTraceDecorator.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.test/src/com/oracle/graal/test/EagerStackTraceDecorator.java	Wed May 14 20:59:27 2014 +0200
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2014, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.graal.test;
+
+import org.junit.runner.notification.*;
+
+public class EagerStackTraceDecorator extends GraalJUnitRunListenerDecorator {
+
+    public EagerStackTraceDecorator(GraalJUnitRunListener l) {
+        super(l);
+    }
+
+    @Override
+    public void testFailed(Failure failure) {
+        super.testFailed(failure);
+        failure.getException().printStackTrace(getWriter());
+    }
+
+}
diff -r ec29b2d3bdb4 -r fcf6e5683082 graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalJUnitCore.java
--- a/graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalJUnitCore.java	Wed May 14 20:58:35 2014 +0200
+++ b/graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalJUnitCore.java	Wed May 14 20:59:27 2014 +0200
@@ -50,6 +50,7 @@
         boolean verbose = false;
         boolean enableTiming = false;
         boolean color = false;
+        boolean eagerStackTrace = false;
         for (String each : args) {
             if (each.charAt(0) == '-') {
                 // command line arguments
@@ -59,6 +60,8 @@
                     enableTiming = true;
                 } else if (each.contentEquals("-JUnitColor")) {
                     color = true;
+                } else if (each.contentEquals("-JUnitEagerStackTrace")) {
+                    eagerStackTrace = true;
                 } else {
                     system.out().println("Unknown command line argument: " + each);
                 }
@@ -86,6 +89,9 @@
         if (color) {
             graalListener = new AnsiTerminalDecorator(graalListener);
         }
+        if (eagerStackTrace) {
+            graalListener = new EagerStackTraceDecorator(graalListener);
+        }
         junitCore.addListener(GraalTextListener.createRunListener(graalListener));
         Result result = junitCore.run(classes.toArray(new Class[0]));
         for (Failure each : missingClasses) {
diff -r ec29b2d3bdb4 -r fcf6e5683082 graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalVerboseTextListener.java
--- a/graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalVerboseTextListener.java	Wed May 14 20:58:35 2014 +0200
+++ b/graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalVerboseTextListener.java	Wed May 14 20:59:27 2014 +0200
@@ -66,7 +66,6 @@
     @Override
     public void testFailed(Failure failure) {
         getWriter().println("FAILED");
-        failure.getException().printStackTrace(getWriter());
     }
 
     @Override
diff -r ec29b2d3bdb4 -r fcf6e5683082 mx/mx_graal.py
--- a/mx/mx_graal.py	Wed May 14 20:58:35 2014 +0200
+++ b/mx/mx_graal.py	Wed May 14 20:59:27 2014 +0200
@@ -957,7 +957,7 @@
         f_testfile.close()
         harness(projectscp, vmArgs)
 
-def _unittest(args, annotations, prefixcp="", whitelist=None, verbose=False, enable_timing=False, regex=None, color=False):
+def _unittest(args, annotations, prefixcp="", whitelist=None, verbose=False, enable_timing=False, regex=None, color=False, eager_stacktrace=False):
     mxdir = dirname(__file__)
     name = 'JUnitWrapper'
     javaSource = join(mxdir, name + '.java')
@@ -978,6 +978,8 @@
         coreArgs.append('-JUnitEnableTiming')
     if color:
         coreArgs.append('-JUnitColor')
+    if eager_stacktrace:
+        coreArgs.append('-JUnitEagerStackTrace')
 
 
     def harness(projectscp, vmArgs):
@@ -1009,6 +1011,7 @@
       --enable-timing        enable JUnit test timing
       --regex <regex>        run only testcases matching a regular expression
       --color                enable colors output
+      --eager-stacktrace     print stacktrace eagerly
 
     To avoid conflicts with VM options '--' can be used as delimiter.
 
@@ -1050,6 +1053,7 @@
     parser.add_argument('--enable-timing', help='enable JUnit test timing', action='store_true')
     parser.add_argument('--regex', help='run only testcases matching a regular expression', metavar='<regex>')
     parser.add_argument('--color', help='enable color output', action='store_true')
+    parser.add_argument('--eager-stacktrace', help='print stacktrace eagerly', action='store_true')
 
     ut_args = []
     delimiter = False
@@ -1076,7 +1080,7 @@
         except IOError:
             mx.log('warning: could not read whitelist: ' + parsed_args.whitelist)
 
-    _unittest(args, ['@Test', '@Parameters'], whitelist=whitelist, verbose=parsed_args.verbose, enable_timing=parsed_args.enable_timing, regex=parsed_args.regex, color=parsed_args.color)
+    _unittest(args, ['@Test', '@Parameters'], whitelist=whitelist, verbose=parsed_args.verbose, enable_timing=parsed_args.enable_timing, regex=parsed_args.regex, color=parsed_args.color, eager_stacktrace=parsed_args.eager_stacktrace)
 
 def shortunittest(args):
     """alias for 'unittest --whitelist test/whitelist_shortunittest.txt'{0}"""