Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix NPE error on class declaration. #279

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,8 @@ test {
dependsOn('dist')

systemProperties 'path.afu.scripts': "${afu}/scripts",
'use.hacks': true

systemProperties += [JDK_JAR: "${checkerFrameworkPath}/checker/dist/jdk8.jar"]
'path.inference.script': "${projectDir}/scripts/inference",
JDK_JAR: "${checkerFrameworkPath}/checker/dist/jdk8.jar"

if (project.hasProperty('emit.test.debug')) {
systemProperties += ["emit.test.debug": 'true']
Expand Down Expand Up @@ -276,7 +275,6 @@ task testCheckerInferenceDevScript(type: Exec, dependsOn: [dist, dependenciesJar
args = ['--mode', 'INFER',
'--checker', 'interning.InterningChecker',
'--solver', 'checkers.inference.solver.MaxSat2TypeSolver',
'--hacks=true',
'testdata/interning/MapAssignment.java']
}

Expand All @@ -301,20 +299,6 @@ afterEvaluate {

// Configure Tests
tasks.withType(Test) {
dependsOn(shadowJar)

systemProperties 'path.afu.scripts': "${afu}/scripts",
'path.inference.script': "${projectDir}/scripts/inference",
'use.hacks': true,
JDK_JAR: "${checkerFrameworkPath}/checker/dist/jdk8.jar"

if (project.hasProperty('emit.test.debug')) {
systemProperties += ["emit.test.debug": 'true']
}

if (isJava8) {
jvmArgs += ["-Xbootclasspath/p:${configurations.javacJar.asPath}"]
}

testLogging {
// Always run the tests
Expand Down
1 change: 0 additions & 1 deletion src/checkers/inference/InferenceAnnotatedTypeFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -607,4 +607,3 @@ public AnnotatedTypeMirror getTypeOfExtendsImplements(Tree clause) {
}

}

5 changes: 0 additions & 5 deletions tests/checkers/inference/DataflowInferenceTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@ public Pair<String, List<String>> getSolverNameAndOptions() {
new ArrayList<String>());
}

@Override
public boolean useHacks() {
return true;
}

@Parameters
public static List<File> getTestFiles(){
List<File> testfiles = new ArrayList<>();//InferenceTestUtilities.findAllSystemTests();
Expand Down