forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

back to java 7

This commit is contained in:
Eric Vergnaud 2020-10-04 13:14:39 +08:00
parent 2bfbbb8c4f
commit d1004f6be1
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -96,8 +96,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<antlr.testinprocess>true</antlr.testinprocess> <antlr.testinprocess>true</antlr.testinprocess>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.7</maven.compiler.target>
</properties> </properties>
<mailingLists> <mailingLists>

30
runtime-testsuite/test/org/antlr/v4/test/runtime/javascript/BaseNodeTest.java
View File

@ -289,8 +289,10 @@ public class BaseNodeTest implements RuntimeTestSupport {
process.getErrorStream()); process.getErrorStream());
stdoutVacuum.start(); stdoutVacuum.start();
stderrVacuum.start(); stderrVacuum.start();
if(!process.waitFor(1L, TimeUnit.MINUTES)) // TODO switch to jdk 8
process.destroyForcibly(); process.waitFor();
// if(!process.waitFor(1L, TimeUnit.MINUTES))
// process.destroyForcibly();
stdoutVacuum.join(); stdoutVacuum.join();
stderrVacuum.join(); stderrVacuum.join();
String output = stdoutVacuum.toString(); String output = stdoutVacuum.toString();
@ -320,8 +322,10 @@ public class BaseNodeTest implements RuntimeTestSupport {
builder.redirectError(new File(tmpdir, "error.txt")); builder.redirectError(new File(tmpdir, "error.txt"));
builder.redirectOutput(new File(tmpdir, "output.txt")); builder.redirectOutput(new File(tmpdir, "output.txt"));
Process process = builder.start(); Process process = builder.start();
if(!process.waitFor(30L, TimeUnit.SECONDS)) // TODO switch to jdk 8
process.destroyForcibly(); process.waitFor();
// if(!process.waitFor(30L, TimeUnit.SECONDS))
// process.destroyForcibly();
int error = process.exitValue(); int error = process.exitValue();
if(error!=0) if(error!=0)
throw new IOException("'npm install' failed"); throw new IOException("'npm install' failed");
@ -334,8 +338,10 @@ public class BaseNodeTest implements RuntimeTestSupport {
builder.redirectError(new File(tmpdir, "error.txt")); builder.redirectError(new File(tmpdir, "error.txt"));
builder.redirectOutput(new File(tmpdir, "output.txt")); builder.redirectOutput(new File(tmpdir, "output.txt"));
Process process = builder.start(); Process process = builder.start();
if(!process.waitFor(30L, TimeUnit.SECONDS)) // TODO switch to jdk 8
process.destroyForcibly(); process.waitFor();
// if(!process.waitFor(30L, TimeUnit.SECONDS))
// process.destroyForcibly();
int error = process.exitValue(); int error = process.exitValue();
if(error!=0) if(error!=0)
throw new IOException("'npm link' failed"); throw new IOException("'npm link' failed");
@ -347,8 +353,10 @@ public class BaseNodeTest implements RuntimeTestSupport {
builder.redirectError(new File(tmpdir, "error.txt")); builder.redirectError(new File(tmpdir, "error.txt"));
builder.redirectOutput(new File(tmpdir, "output.txt")); builder.redirectOutput(new File(tmpdir, "output.txt"));
Process process = builder.start(); Process process = builder.start();
if(!process.waitFor(30L, TimeUnit.SECONDS)) // TODO switch to jdk 8
process.destroyForcibly(); process.waitFor();
// if(!process.waitFor(30L, TimeUnit.SECONDS))
// process.destroyForcibly();
int error = process.exitValue(); int error = process.exitValue();
if(error!=0) if(error!=0)
throw new IOException("'npm link antlr4' failed"); throw new IOException("'npm link antlr4' failed");
@ -371,8 +379,10 @@ public class BaseNodeTest implements RuntimeTestSupport {
Process process = builder.start(); Process process = builder.start();
StreamVacuum vacuum = new StreamVacuum(process.getInputStream()); StreamVacuum vacuum = new StreamVacuum(process.getInputStream());
vacuum.start(); vacuum.start();
if(!process.waitFor(30L, TimeUnit.SECONDS)) // TODO switch to jdk 8
process.destroyForcibly(); process.waitFor();
// if(!process.waitFor(30L, TimeUnit.SECONDS))
// process.destroyForcibly();
vacuum.join(); vacuum.join();
return process.exitValue() == 0; return process.exitValue() == 0;
} catch (Exception e) { } catch (Exception e) {