Use RelastTest for every test case now.

build.gradle

@@ -151,49 +151,26 @@ task updateVersion {
 
 processResources.dependsOn updateVersion
 
-task preprocessRelationTest(type: JavaExec, group: 'verification') {
-
-    doFirst {
-        delete 'src/test/jastadd/relations/Relations.ast', 'src/test/jastadd/relations/Relations.jadd'
-    }
-
-    classpath = sourceSets.main.runtimeClasspath
-    main = 'org.jastadd.relast.compiler.Compiler'
-    //noinspection GroovyAssignabilityCheck
-    args 'src/test/jastadd/relations/Relations.relast', '--quiet', '--useJastAddNames', '--file', '--grammarName=src/test/jastadd/relations/Relations'
-}
-
-task doublePreprocessRelationTest(type: JavaExec, group: 'verification') {
-
-    doFirst {
-        delete 'src/test/jastadd/relations/Relations2.ast', 'src/test/jastadd/relations/Relations2.jadd'
-    }
-
-    classpath = sourceSets.main.runtimeClasspath
-    main = 'org.jastadd.relast.compiler.Compiler'
-    //noinspection GroovyAssignabilityCheck
-    args 'src/test/jastadd/relations/Relations.ast', '--quiet', '--useJastAddNames', '--file', '--grammarName=src/test/jastadd/relations/Relations2'
+task firstRelationsRun(type: RelastTest) {
+    relastFiles 'src/test/jastadd/relations/Relations.relast'
+    grammarName = 'src/test/jastadd/relations/Relations'
+    useJastAddNames = true
+    packageName = 'relations.ast'
+    moreInputFiles 'src/test/jastadd/Utils.jadd'
 }
 
-task compileRelationTest(type: JavaExec, group: 'verification') {
+task secondRelationsRun(type: RelastTest, dependsOn: firstRelationsRun) {
+    relastFiles 'src/test/jastadd/relations/Relations.ast'
+    grammarName = 'src/test/jastadd/relations/Relations2'
+    useJastAddNames = true
+    packageName = 'ignored'
 
-    doFirst {
-        delete 'src/test/java-gen/relations'
+    doLast {
+        delete fileTree('src/test/java-gen/ignored')
+        delete 'src/test/java-gen/ignored'
     }
-
-    classpath = sourceSets.main.runtimeClasspath
-    main = 'org.jastadd.JastAdd'
-    //noinspection GroovyAssignabilityCheck
-    args '--o=src/test/java-gen/', '--package=relations.ast',
-            'src/test/jastadd/relations/Relations.ast',
-            'src/test/jastadd/relations/Relations.jadd',
-            'src/test/jastadd/Utils.jadd'
 }
 
-test.dependsOn compileRelationTest
-compileRelationTest.dependsOn doublePreprocessRelationTest
-doublePreprocessRelationTest.dependsOn preprocessRelationTest
-
 task compileConstructorTest(type: RelastTest) {
     relastFiles 'src/test/jastadd/constructors/Constructors.relast'
     grammarName = 'src/test/jastadd/constructors/Constructors'