Mercurial > hg > truffle

changeset 5219:ddccd4abdb09

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configured test source directory for graal.graph project
author Doug Simon <doug.simon@oracle.com>
date Tue, 10 Apr 2012 12:38:13 +0200
parents c4696edb6e95
children d066f83db303
files graal/com.oracle.graal.graph/test/com/oracle/graal/graph/test/TypedNodeIteratorTest.java mx/projects mxtool/mx.py
diffstat 3 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.graph/test/com/oracle/graal/graph/test/TypedNodeIteratorTest.java	Tue Apr 10 12:22:46 2012 +0200
+++ b/graal/com.oracle.graal.graph/test/com/oracle/graal/graph/test/TypedNodeIteratorTest.java	Tue Apr 10 12:38:13 2012 +0200
@@ -46,7 +46,7 @@
         TestNode testNode = new TestNode("a");
         Graph graph = new Graph();
         graph.add(testNode);
-        testNode.delete();
+        testNode.safeDelete();
         assertEquals("", toString(graph.getNodes(TestNode.class)));
     }
 
@@ -56,7 +56,7 @@
         Graph graph = new Graph();
         graph.add(new TestNode("a"));
         graph.add(testNode);
-        testNode.delete();
+        testNode.safeDelete();
         assertEquals("a", toString(graph.getNodes(TestNode.class)));
         graph.add(new TestNode("c"));
         assertEquals("ac", toString(graph.getNodes(TestNode.class)));
@@ -77,7 +77,7 @@
         TestNode c = new TestNode("c");
         graph.add(c);
         assertTrue(iterator.hasNext());
-        c.delete();
+        c.safeDelete();
         assertFalse(iterator.hasNext());
     }
 
@@ -90,11 +90,11 @@
             for (int i = 0; i < name.length(); ++i) {
                 char c = name.charAt(i);
                 if (c == 'a') {
-                    tn.delete();
+                    tn.safeDelete();
                     graph.add(new TestNode("b"));
                     graph.add(new TestNode("c"));
                 } else if (c == 'b') {
-                    tn.delete();
+                    tn.safeDelete();
                 } else if (c == 'c') {
                     graph.add(new TestNode("d"));
                     graph.add(new TestNode("e"));
@@ -107,9 +107,9 @@
                 } else if (c == 'd') {
                     for (TestNode tn2 : graph.getNodes(TestNode.class)) {
                         if (tn2.getName().equals("e")) {
-                            tn2.delete();
+                            tn2.safeDelete();
                         } else if (tn2.getName().equals("c")) {
-                            tn2.delete();
+                            tn2.safeDelete();
                         }
                     }
                 } else if (c == 'e') {
@@ -146,7 +146,7 @@
         assertEquals(3, z);
     }
 
-    private String toString(Iterable<TestNode> nodes) {
+    private static String toString(Iterable<TestNode> nodes) {
         StringBuilder sb = new StringBuilder();
         for (TestNode tn : nodes) {
             sb.append(tn.getName());
--- a/mx/projects	Tue Apr 10 12:22:46 2012 +0200
+++ b/mx/projects	Tue Apr 10 12:38:13 2012 +0200
@@ -31,7 +31,7 @@
 
 # graal.graph
 project@com.oracle.graal.graph@subDir=graal
-project@com.oracle.graal.graph@sourceDirs=src
+project@com.oracle.graal.graph@sourceDirs=src,test
 project@com.oracle.graal.graph@dependencies=com.oracle.graal.debug,JUNIT
 project@com.oracle.graal.graph@javaCompliance=1.7
 
--- a/mxtool/mx.py	Tue Apr 10 12:22:46 2012 +0200
+++ b/mxtool/mx.py	Tue Apr 10 12:38:13 2012 +0200
@@ -1633,7 +1633,7 @@
                 out.close('filter')
 
             out.close('fileset-config')
-            update_file(dotCheckstyle, out.xml(indent='\t', newl='\n'))
+            update_file(dotCheckstyle, out.xml(indent='  ', newl='\n'))
 
         out = XMLDoc()
         out.open('projectDescription')