diff --git a/.travis-build.sh b/.travis-build.sh index e8eefbc04..73a511214 100755 --- a/.travis-build.sh +++ b/.travis-build.sh @@ -8,6 +8,7 @@ export SHELLOPTS . ./.travis-build-without-test.sh +./gradlew testCheckerInferenceScript ./gradlew testCheckerInferenceDevScript -./gradlew test +./gradlew test \ No newline at end of file diff --git a/build.gradle b/build.gradle index dfd422b8d..de8c40680 100644 --- a/build.gradle +++ b/build.gradle @@ -193,6 +193,16 @@ task release(type: Zip) { baseName = 'release' } + +task testCheckerInferenceScript(type: Exec, dependsOn: dist) { + description 'Basic sanity check of scripts/inference' + executable './scripts/inference' + args = ['--mode', 'TYPECHECK', + '--checker', 'ostrusted.OsTrustedChecker', + '--solver', 'checkers.inference.solver.PropagationSolver', + 'testdata/ostrusted/Test.java'] +} + task testCheckerInferenceDevScript(type: Exec, dependsOn: [dist, dependenciesJar]) { description 'Basic sanity check of scripts/inference-dev' executable './scripts/inference-dev' diff --git a/src/checkers/inference/InferenceLauncher.java b/src/checkers/inference/InferenceLauncher.java index 7a78345ea..d7f7a4b03 100644 --- a/src/checkers/inference/InferenceLauncher.java +++ b/src/checkers/inference/InferenceLauncher.java @@ -127,6 +127,7 @@ public void typecheck(String [] javaFiles) { final CheckerMain checkerMain = new CheckerMain(InferenceOptions.checkerJar, options); checkerMain.addToRuntimeClasspath(getInferenceRuntimeJars()); + checkerMain.addToClasspath(getInferenceRuntimeJars()); if (InferenceOptions.printCommands) { outStream.println("Running typecheck command:"); diff --git a/testdata/ostrusted/Test.java b/testdata/ostrusted/Test.java new file mode 100644 index 000000000..fb529c0bb --- /dev/null +++ b/testdata/ostrusted/Test.java @@ -0,0 +1,4 @@ +import ostrusted.qual.*; +// For basic sanity check. +class Test { +}