Adding Java 7 patch, support running tests on Java 7

build.gradle

@@ -108,7 +108,7 @@ def setup(prjs, closure) {
     }
 }
 
-setup(['agent', 'framework', 'tests-java7', 'tests-java8'], {
+setup(['agent', 'dcevm'], {
     apply plugin: 'java'
     apply plugin: 'idea'
 
@@ -125,25 +125,21 @@ project('agent') {
     }
 }
 
-project('framework') {
+project('dcevm') {
     dependencies {
         compile project(':agent')
         compile group: 'asm', name: 'asm-all', version: '3.3.+'
         compile files(System.getProperty("java.home") + '/../lib/tools.jar')
-    }
-}
 
-project('tests-java8') {
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
-}
-
-setup(['tests-java7', 'tests-java8'], {
-    dependencies {
-        compile project(':framework')
         testCompile group: 'junit', name: 'junit', version: '4.11'
     }
 
+    def m = System.getProperty('java.version') =~ /^1\.([0-9]+)\.*/
+    def major = m[0][1].toInteger()
+    if (major >= 7) {
+        sourceSets.test.java.srcDirs += 'src/test/java8'
+    }
+
     test {
         executable new File(targetJreFile, 'bin/java')
 
@@ -160,7 +156,7 @@ setup(['tests-java7', 'tests-java8'], {
     }
 
     test.dependsOn project(':hotspot').tasks[kind == 'fastdebug' ? 'installFastdebug' : 'installProduct']
-})
+}
 
 
 enum Arch {

tests-java7/src/test/java/org/dcevm/test/structural/RedefineObjectClassTest.java → dcevm/src/test/java/org/dcevm/test/structural/RedefineObjectClassTest.java

@@ -85,7 +85,7 @@ public class RedefineObjectClassTest {
         }
 
         public final String myTestFunction___() {
-            return "test";
+            return "org/dcevm/test";
         }
 
         public final native void notify___();
@@ -141,7 +141,7 @@ public class RedefineObjectClassTest {
 
 
         //assertEquals("test", o.toString());
-        assertEquals("test", Helper.access(o));
+        assertEquals("org/dcevm/test", Helper.access(o));
         __toVersion__(0);
         __toVersion__(1);
         __toVersion__(0);

gradle.properties

@@ -22,7 +22,8 @@ targetJre=build/jre
 
 # Tag to base DCEVM on
 hotspotTag=jdk8u5-b13
+#hotspotTag=jdk7u51-b13
 
 # Repository to clone hotspot from
 hotspotRepository=http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot
-#hotspotRepository=http://hg.openjdk.java.net/jdk7u/jdk7u/hotspot
+#hotspotRepository=http://hg.openjdk.java.net/jdk7u/jdk7u/hotspot

settings.gradle

@@ -1 +1 @@
-include 'agent', 'framework', 'tests-java7', 'tests-java8', 'hotspot'
+include 'agent', 'dcevm', 'hotspot'