# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1339669834 -7200
# Node ID 7034c6a6c999b2687aee42ce84a13353ee4023bf
# Parent  e4b1bc5e29e0c23f2c7b23509f611b699d68d8c0
removed debug scope around tests that are expected to throw an exception (reduces console noise)

diff -r e4b1bc5e29e0 -r 7034c6a6c999 graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/ScalarTypeSystemTest.java
--- a/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/ScalarTypeSystemTest.java	Thu Jun 14 12:28:20 2012 +0200
+++ b/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/ScalarTypeSystemTest.java	Thu Jun 14 12:30:34 2012 +0200
@@ -160,17 +160,14 @@
     }
 
     private void test(final String snippet, final String referenceSnippet) {
-        Debug.scope("ScalarTypeSystemTest", new DebugDumpScope(snippet), new Runnable() {
-            public void run() {
-                StructuredGraph graph = parse(snippet);
-                Debug.dump(graph, "Graph");
-//                TypeSystemTest.outputGraph(graph);
-                new CanonicalizerPhase(null, runtime(), null).apply(graph);
-                new CheckCastEliminationPhase().apply(graph);
-                new CanonicalizerPhase(null, runtime(), null).apply(graph);
-                StructuredGraph referenceGraph = parse(referenceSnippet);
-                assertEquals(referenceGraph, graph);
-            }
-        });
+        // No debug scope to reduce console noise for @Test(expected = ...) tests
+        StructuredGraph graph = parse(snippet);
+        Debug.dump(graph, "Graph");
+//        TypeSystemTest.outputGraph(graph);
+        new CanonicalizerPhase(null, runtime(), null).apply(graph);
+        new CheckCastEliminationPhase().apply(graph);
+        new CanonicalizerPhase(null, runtime(), null).apply(graph);
+        StructuredGraph referenceGraph = parse(referenceSnippet);
+        assertEquals(referenceGraph, graph);
     }
 }
diff -r e4b1bc5e29e0 -r 7034c6a6c999 graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/StraighteningTest.java
--- a/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/StraighteningTest.java	Thu Jun 14 12:28:20 2012 +0200
+++ b/graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/StraighteningTest.java	Thu Jun 14 12:30:34 2012 +0200
@@ -85,14 +85,11 @@
     }
 
     private void test(final String snippet) {
-        Debug.scope("StraighteningTest", new DebugDumpScope(snippet), new Runnable() {
-            public void run() {
-                StructuredGraph graph = parse(snippet);
-                Debug.dump(graph, "Graph");
-                new CanonicalizerPhase(null, runtime(), null).apply(graph);
-                StructuredGraph referenceGraph = parse(REFERENCE_SNIPPET);
-                assertEquals(referenceGraph, graph);
-            }
-        });
+        // No debug scope to reduce console noise for @Test(expected = ...) tests
+        StructuredGraph graph = parse(snippet);
+        Debug.dump(graph, "Graph");
+        new CanonicalizerPhase(null, runtime(), null).apply(graph);
+        StructuredGraph referenceGraph = parse(REFERENCE_SNIPPET);
+        assertEquals(referenceGraph, graph);
     }
 }