Skip to content
Snippets Groups Projects
Commit c17aaecb authored by hansen's avatar hansen
Browse files

removed tla2bAst from compile path

parent b84c29f4
No related branches found
No related tags found
No related merge requests found
......@@ -92,7 +92,7 @@ jar {
jar {
manifest {
attributes "Main-Class" : 'de.tlc4b.TLC4B'
attributes "Class-Path": './tla/ tlatools.jar'
attributes "Class-Path": 'tlatools.jar'
}
}
......
......@@ -219,7 +219,7 @@ public class TLC4B {
}
}
private void progress(String[] args) throws IOException, BException {
public void progress(String[] args) throws IOException, BException {
handleParameter(args);
handleMainFileName();
......@@ -426,26 +426,12 @@ public class TLC4B {
}
}
public static void testParse(String[] args, boolean deleteFiles)
throws Exception {
TLC4BGlobals.resetGlobals();
TLC4BGlobals.setDeleteOnExit(deleteFiles);
TLC4BGlobals.setCreateTraceFile(false);
TLC4BGlobals.setTestingMode(true);
// B2TLAGlobals.setCleanup(true);
TLC4B tlc4b = new TLC4B();
try {
tlc4b.progress(args);
} catch (Exception e) {
e.printStackTrace();
System.err.println(e.getMessage());
throw e;
public File getBuildDir() {
return buildDir;
}
File module = new File(tlc4b.buildDir,
tlc4b.machineFileNameWithoutFileExtension + ".tla");
// parse result
new de.tla2bAst.Translator(module.getCanonicalPath());
public String getMachineFileNameWithoutFileExtension() {
return machineFileNameWithoutFileExtension;
}
}
package de.tlc4b.coverage;
import java.io.File;
import java.util.ArrayList;
......@@ -17,7 +16,6 @@ import de.tlc4b.util.PolySuite.Configuration;
@RunWith(PolySuite.class)
public class IntegrationCoverageTest extends AbstractParseMachineTest {
private final File machine;
public IntegrationCoverageTest(File machine, TLCResult result) {
......@@ -41,6 +39,7 @@ public class IntegrationCoverageTest extends AbstractParseMachineTest{
ignoreList.add("./src/test/resources/other/");
ignoreList.add("./src/test/resources/test/");
ignoreList.add("./src/test/resources/testing/");
ignoreList.add("./src/test/resources/todo/");
return getConfiguration2(list, ignoreList);
}
......
......@@ -181,7 +181,6 @@ public class TestUtil {
return null;
}
private static Process startJVM(final String optionsAsString,
final String mainClass, final String[] arguments)
throws IOException {
......@@ -204,6 +203,28 @@ public class TestUtil {
return process;
}
public static void testParse(String[] args, boolean deleteFiles)
throws Exception {
TLC4BGlobals.resetGlobals();
TLC4BGlobals.setDeleteOnExit(deleteFiles);
TLC4BGlobals.setCreateTraceFile(false);
TLC4BGlobals.setTestingMode(true);
// B2TLAGlobals.setCleanup(true);
TLC4B tlc4b = new TLC4B();
try {
tlc4b.progress(args);
} catch (Exception e) {
e.printStackTrace();
System.err.println(e.getMessage());
throw e;
}
File module = new File(tlc4b.getBuildDir(),
tlc4b.getMachineFileNameWithoutFileExtension() + ".tla");
// parse result
new de.tla2bAst.Translator(module.getCanonicalPath());
}
}
class StreamGobbler extends Thread {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment