# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1328878684 -3600
# Node ID ce13e056d821147f2df59f4a2388c574617c9f07
# Parent  daba89671d29c0d28a1c356f55330ff723fc8c66
explicitly exclude com.oracle.max.graal.tests from graal class path to make JUnit tests work
(otherwise the @Test annotation is omitted if it isn't found in the boot classpath)

diff -r daba89671d29 -r ce13e056d821 graal/com.oracle.max.graal.lir/src/com/oracle/max/graal/lir/asm/TargetMethodAssembler.java
--- a/graal/com.oracle.max.graal.lir/src/com/oracle/max/graal/lir/asm/TargetMethodAssembler.java	Thu Feb 09 18:36:11 2012 -0800
+++ b/graal/com.oracle.max.graal.lir/src/com/oracle/max/graal/lir/asm/TargetMethodAssembler.java	Fri Feb 10 13:58:04 2012 +0100
@@ -97,7 +97,7 @@
         Debug.metric("DataPatches").add(targetMethod.dataReferences.size());
         Debug.metric("ExceptionHandlersEmitted").add(targetMethod.exceptionHandlers.size());
 
-        Debug.log("Finished target method %s, isStub %d", name, isStub);
+        Debug.log("Finished target method %s, isStub %b", name, isStub);
 /*
         if (GraalOptions.PrintAssembly && !TTY.isSuppressed() && !isStub) {
             Util.printSection("Target Method", Util.SECTION_CHARACTER);
diff -r daba89671d29 -r ce13e056d821 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Thu Feb 09 18:36:11 2012 -0800
+++ b/src/share/vm/runtime/arguments.cpp	Fri Feb 10 13:58:04 2012 +0100
@@ -2103,7 +2103,7 @@
     errno = 0;
     DIR* graal_dir_handle = os::opendir(graal_dir);
     while ((dentry = os::readdir(graal_dir_handle, (struct dirent *)tdbuf)) != NULL) {
-      if (strcmp(dentry->d_name, ".") != 0 && strcmp(dentry->d_name, "..")) {
+      if (strcmp(dentry->d_name, ".") != 0 && strcmp(dentry->d_name, "..") != 0 && strcmp(dentry->d_name, "com.oracle.max.graal.tests") != 0) {
         prepend_to_graal_classpath(scp_compiler, graal_dir, dentry->d_name);
         if (PrintVMOptions) {
           tty->print_cr("Adding project directory %s to bootclasspath", dentry->d_name);