DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use the proper JUnit mechanism for conditionally skipping tests 

These are slow tests that we were already effectively turning into
no-ops when running on Travis CI.  By skipping them using the proper
JUnit mechanism, these tests will show up as ignored or skipped in
test outcome reports.  That's better than having them show up as
passing, when we really don't know whether they would have passed or
failed.
This commit is contained in:
Ben Liblit 2018-03-05 11:44:43 -06:00 committed by Manu Sridharan
parent 6cb72ad2b8
commit 0512241027
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/callgraph/fieldbased/test/AbstractFieldBasedTest.java
View File

@ -4,6 +4,8 @@ import java.net.URL;
import java.util.Map;
import java.util.Set;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assume.*;
import org.junit.Before;
import com.ibm.wala.cast.ir.translator.TranslatorToCAst.Error;
@ -55,12 +57,9 @@ public abstract class AbstractFieldBasedTest extends TestJSCallGraphShape {
/**
* for long-running tests that tend to time out on Travis
*/
protected JSCallGraph runTestExceptOnTravis(URL url, Object[][] assertions, BuilderType... builderTypes) throws WalaException, Error, CancelException {
if (System.getenv("TRAVIS") == null) {
return runTest(url, assertions, builderTypes);
} else {
return null;
}
protected void runTestExceptOnTravis(URL url, Object[][] assertions, BuilderType... builderTypes) throws WalaException, Error, CancelException {
assumeThat("not running on Travis CI", System.getenv("TRAVIS"), nullValue());
runTest(url, assertions, builderTypes);
}
protected void dumpCG(JSCallGraph cg) {