From 9921e3c4279caf6f4e019ae8e1577eb9c8429d86 Mon Sep 17 00:00:00 2001 From: Jeremy Dubreil Date: Tue, 8 Nov 2016 05:56:08 -0800 Subject: [PATCH] [infer] Unbreak the build integration tests Summary: The tests were broken on master Reviewed By: sblackshear Differential Revision: D4144871 fbshipit-source-id: 1261f3f --- infer/tests/build_systems/ant/issues.exp | 16 ++++ .../expected_outputs/buck_report.json | 80 +++++++++++++++++++ .../clang_compilation_database_report.json | 2 +- .../expected_outputs/componentkit_report.json | 2 +- 4 files changed, 98 insertions(+), 2 deletions(-) diff --git a/infer/tests/build_systems/ant/issues.exp b/infer/tests/build_systems/ant/issues.exp index 8ab10273d..a6f047287 100644 --- a/infer/tests/build_systems/ant/issues.exp +++ b/infer/tests/build_systems/ant/issues.exp @@ -46,6 +46,22 @@ src/infer/FilterOutputStreamLeaks.java, void FilterOutputStreamLeaks.gzipOutputS src/infer/FilterOutputStreamLeaks.java, void FilterOutputStreamLeaks.gzipOutputStreamNotClosedAfterFlush(), 7, RESOURCE_LEAK src/infer/FilterOutputStreamLeaks.java, void FilterOutputStreamLeaks.inflaterOutputStreamNotClosedAfterWrite(), 8, RESOURCE_LEAK src/infer/FilterOutputStreamLeaks.java, void FilterOutputStreamLeaks.printStreamNotClosedAfterWrite(), 6, RESOURCE_LEAK +src/infer/GuardedByExample.java, Object GuardedByExample.byRefTrickyBad(), 5, UNSAFE_GUARDED_BY_ACCESS +src/infer/GuardedByExample.java, String GuardedByExample$3.readFromInnerClassBad1(), 2, UNSAFE_GUARDED_BY_ACCESS +src/infer/GuardedByExample.java, String GuardedByExample$4.readFromInnerClassBad2(), 1, UNSAFE_GUARDED_BY_ACCESS +src/infer/GuardedByExample.java, void GuardedByExample.readFAfterBlockBad(), 3, UNSAFE_GUARDED_BY_ACCESS +src/infer/GuardedByExample.java, void GuardedByExample.readFBad(), 1, UNSAFE_GUARDED_BY_ACCESS +src/infer/GuardedByExample.java, void GuardedByExample.readFBadButSuppressedOther(), 1, UNSAFE_GUARDED_BY_ACCESS +src/infer/GuardedByExample.java, void GuardedByExample.readFBadWrongAnnotation(), 1, UNSAFE_GUARDED_BY_ACCESS +src/infer/GuardedByExample.java, void GuardedByExample.readFBadWrongLock(), 2, UNSAFE_GUARDED_BY_ACCESS +src/infer/GuardedByExample.java, void GuardedByExample.readHBad(), 2, UNSAFE_GUARDED_BY_ACCESS +src/infer/GuardedByExample.java, void GuardedByExample.readHBadSynchronizedMethodShouldntHelp(), 1, UNSAFE_GUARDED_BY_ACCESS +src/infer/GuardedByExample.java, void GuardedByExample.synchronizedMethodReadBad(), 1, UNSAFE_GUARDED_BY_ACCESS +src/infer/GuardedByExample.java, void GuardedByExample.synchronizedMethodWriteBad(), 1, UNSAFE_GUARDED_BY_ACCESS +src/infer/GuardedByExample.java, void GuardedByExample.synchronizedOnThisBad(), 1, UNSAFE_GUARDED_BY_ACCESS +src/infer/GuardedByExample.java, void GuardedByExample.writeFAfterBlockBad(), 3, UNSAFE_GUARDED_BY_ACCESS +src/infer/GuardedByExample.java, void GuardedByExample.writeFBad(), 1, UNSAFE_GUARDED_BY_ACCESS +src/infer/GuardedByExample.java, void GuardedByExample.writeFBadWrongLock(), 2, UNSAFE_GUARDED_BY_ACCESS src/infer/HashMapExample.java, int HashMapExample.getOneIntegerWithoutCheck(), 6, NULL_DEREFERENCE src/infer/HashMapExample.java, void HashMapExample.getTwoIntegersWithOneCheck(Integer,Integer), 11, NULL_DEREFERENCE src/infer/NullPointerExceptions.java, String NullPointerExceptions.hashmapNPE(HashMap,Object), 1, NULL_DEREFERENCE diff --git a/infer/tests/build_systems/expected_outputs/buck_report.json b/infer/tests/build_systems/expected_outputs/buck_report.json index ae8bc50c4..a3762206c 100644 --- a/infer/tests/build_systems/expected_outputs/buck_report.json +++ b/infer/tests/build_systems/expected_outputs/buck_report.json @@ -189,6 +189,11 @@ "file": "infer/tests/codetoanalyze/java/infer/WriterLeaks.java", "procedure": "void WriterLeaks.bufferedWriterNotClosedAfterWrite()" }, + { + "bug_type": "UNSAFE_GUARDED_BY_ACCESS", + "file": "infer/tests/codetoanalyze/java/infer/GuardedByExample.java", + "procedure": "Object GuardedByExample.byRefTrickyBad()" + }, { "bug_type": "RESOURCE_LEAK", "file": "infer/tests/codetoanalyze/java/infer/FilterInputStreamLeaks.java", @@ -734,6 +739,51 @@ "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java", "procedure": "int ResourceLeaks.readConfigNotCloseStream(String)" }, + { + "bug_type": "UNSAFE_GUARDED_BY_ACCESS", + "file": "infer/tests/codetoanalyze/java/infer/GuardedByExample.java", + "procedure": "void GuardedByExample.readFAfterBlockBad()" + }, + { + "bug_type": "UNSAFE_GUARDED_BY_ACCESS", + "file": "infer/tests/codetoanalyze/java/infer/GuardedByExample.java", + "procedure": "void GuardedByExample.readFBad()" + }, + { + "bug_type": "UNSAFE_GUARDED_BY_ACCESS", + "file": "infer/tests/codetoanalyze/java/infer/GuardedByExample.java", + "procedure": "void GuardedByExample.readFBadButSuppressedOther()" + }, + { + "bug_type": "UNSAFE_GUARDED_BY_ACCESS", + "file": "infer/tests/codetoanalyze/java/infer/GuardedByExample.java", + "procedure": "void GuardedByExample.readFBadWrongAnnotation()" + }, + { + "bug_type": "UNSAFE_GUARDED_BY_ACCESS", + "file": "infer/tests/codetoanalyze/java/infer/GuardedByExample.java", + "procedure": "void GuardedByExample.readFBadWrongLock()" + }, + { + "bug_type": "UNSAFE_GUARDED_BY_ACCESS", + "file": "infer/tests/codetoanalyze/java/infer/GuardedByExample.java", + "procedure": "String GuardedByExample$3.readFromInnerClassBad1()" + }, + { + "bug_type": "UNSAFE_GUARDED_BY_ACCESS", + "file": "infer/tests/codetoanalyze/java/infer/GuardedByExample.java", + "procedure": "String GuardedByExample$4.readFromInnerClassBad2()" + }, + { + "bug_type": "UNSAFE_GUARDED_BY_ACCESS", + "file": "infer/tests/codetoanalyze/java/infer/GuardedByExample.java", + "procedure": "void GuardedByExample.readHBad()" + }, + { + "bug_type": "UNSAFE_GUARDED_BY_ACCESS", + "file": "infer/tests/codetoanalyze/java/infer/GuardedByExample.java", + "procedure": "void GuardedByExample.readHBadSynchronizedMethodShouldntHelp()" + }, { "bug_type": "RESOURCE_LEAK", "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java", @@ -794,6 +844,21 @@ "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java", "procedure": "void NullPointerExceptions.stringVarEqualsFalseNPE()" }, + { + "bug_type": "UNSAFE_GUARDED_BY_ACCESS", + "file": "infer/tests/codetoanalyze/java/infer/GuardedByExample.java", + "procedure": "void GuardedByExample.synchronizedMethodReadBad()" + }, + { + "bug_type": "UNSAFE_GUARDED_BY_ACCESS", + "file": "infer/tests/codetoanalyze/java/infer/GuardedByExample.java", + "procedure": "void GuardedByExample.synchronizedMethodWriteBad()" + }, + { + "bug_type": "UNSAFE_GUARDED_BY_ACCESS", + "file": "infer/tests/codetoanalyze/java/infer/GuardedByExample.java", + "procedure": "void GuardedByExample.synchronizedOnThisBad()" + }, { "bug_type": "NULL_DEREFERENCE", "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java", @@ -834,6 +899,21 @@ "file": "infer/tests/codetoanalyze/java/infer/CloseableAsResourceExample.java", "procedure": "void CloseableAsResourceExample.withException()" }, + { + "bug_type": "UNSAFE_GUARDED_BY_ACCESS", + "file": "infer/tests/codetoanalyze/java/infer/GuardedByExample.java", + "procedure": "void GuardedByExample.writeFAfterBlockBad()" + }, + { + "bug_type": "UNSAFE_GUARDED_BY_ACCESS", + "file": "infer/tests/codetoanalyze/java/infer/GuardedByExample.java", + "procedure": "void GuardedByExample.writeFBad()" + }, + { + "bug_type": "UNSAFE_GUARDED_BY_ACCESS", + "file": "infer/tests/codetoanalyze/java/infer/GuardedByExample.java", + "procedure": "void GuardedByExample.writeFBadWrongLock()" + }, { "bug_type": "RESOURCE_LEAK", "file": "infer/tests/codetoanalyze/java/infer/WriterLeaks.java", diff --git a/infer/tests/build_systems/expected_outputs/clang_compilation_database_report.json b/infer/tests/build_systems/expected_outputs/clang_compilation_database_report.json index 1361926e2..670aacd63 100644 --- a/infer/tests/build_systems/expected_outputs/clang_compilation_database_report.json +++ b/infer/tests/build_systems/expected_outputs/clang_compilation_database_report.json @@ -4,4 +4,4 @@ "file": "hello.cpp", "procedure": "test" } -] +] \ No newline at end of file diff --git a/infer/tests/build_systems/expected_outputs/componentkit_report.json b/infer/tests/build_systems/expected_outputs/componentkit_report.json index 3484d2652..8222406b3 100644 --- a/infer/tests/build_systems/expected_outputs/componentkit_report.json +++ b/infer/tests/build_systems/expected_outputs/componentkit_report.json @@ -4,4 +4,4 @@ "file": "TestIgnoreImports.mm", "procedure": "SomeClass_new" } -] +] \ No newline at end of file