r360805 - Revert "[analyzer] Add a test for plugins using checker dependencies"

[Kristof Umann via cfe-commits]

Author: szelethus
Date: Wed May 15 13:19:51 2019
New Revision: 360805

URL: http://llvm.org/viewvc/llvm-project?rev=360805&view=rev
Log:
Revert "[analyzer] Add a test for plugins using checker dependencies"

Buildbots don't seem to find the new plugin.

Added:
    cfe/trunk/examples/analyzer-plugin/
      - copied from r360798, cfe/trunk/examples/analyzer-plugin/
Removed:
    cfe/trunk/test/Analysis/plugins/
Modified:
    cfe/trunk/examples/CMakeLists.txt
    cfe/trunk/test/Analysis/checker-plugins.c
    cfe/trunk/test/Analysis/lit.local.cfg
    cfe/trunk/test/CMakeLists.txt

Modified: cfe/trunk/examples/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/examples/CMakeLists.txt?rev=360805&r1=360804&r2=360805&view=diff
==============================================================================
--- cfe/trunk/examples/CMakeLists.txt (original)
+++ cfe/trunk/examples/CMakeLists.txt Wed May 15 13:19:51 2019
@@ -3,6 +3,9 @@ if(NOT CLANG_BUILD_EXAMPLES)
   set(EXCLUDE_FROM_ALL ON)
 endif()
 
+if(CLANG_ENABLE_STATIC_ANALYZER)
+add_subdirectory(analyzer-plugin)
+endif()
 add_subdirectory(clang-interpreter)
 add_subdirectory(PrintFunctionNames)
 add_subdirectory(AnnotateFunctions)

Modified: cfe/trunk/test/Analysis/checker-plugins.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/checker-plugins.c?rev=360805&r1=360804&r2=360805&view=diff
==============================================================================
--- cfe/trunk/test/Analysis/checker-plugins.c (original)
+++ cfe/trunk/test/Analysis/checker-plugins.c Wed May 15 13:19:51 2019
@@ -1,8 +1,5 @@
-// RUN: %clang_analyze_cc1 -verify %s \
-// RUN:   -load %llvmshlibdir/SampleAnalyzerPlugin%pluginext \
-// RUN:   -analyzer-checker='example.MainCallChecker'
-
-// REQUIRES: plugins
+// RUN: %clang_analyze_cc1 -load %llvmshlibdir/SampleAnalyzerPlugin%pluginext -analyzer-checker='example.MainCallChecker' -verify %s
+// REQUIRES: plugins, examples
 
 // Test that the MainCallChecker example analyzer plugin loads and runs.
 
@@ -11,22 +8,3 @@ int main();
 void caller() {
   main(); // expected-warning {{call to main}}
 }
-
-// RUN: %clang_analyze_cc1 %s \
-// RUN:   -load %llvmshlibdir/CheckerDependencyHandlingAnalyzerPlugin%pluginext\
-// RUN:   -analyzer-checker=example.DependendentChecker \
-// RUN:   -analyzer-list-enabled-checkers \
-// RUN:   2>&1 | FileCheck %s -check-prefix=CHECK-IMPLICITLY-ENABLED
-
-// CHECK-IMPLICITLY-ENABLED: example.Dependency
-// CHECK-IMPLICITLY-ENABLED: example.DependendentChecker
-
-// RUN: %clang_analyze_cc1 %s \
-// RUN:   -load %llvmshlibdir/CheckerDependencyHandlingAnalyzerPlugin%pluginext\
-// RUN:   -analyzer-checker=example.DependendentChecker \
-// RUN:   -analyzer-disable-checker=example.Dependency \
-// RUN:   -analyzer-list-enabled-checkers \
-// RUN:   2>&1 | FileCheck %s -check-prefix=CHECK-IMPLICITLY-DISABLED
-
-// CHECK-IMPLICITLY-DISABLED-NOT: example.Dependency
-// CHECK-IMPLICITLY-DISABLED-NOT: example.DependendentChecker

Modified: cfe/trunk/test/Analysis/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/lit.local.cfg?rev=360805&r1=360804&r2=360805&view=diff
==============================================================================
--- cfe/trunk/test/Analysis/lit.local.cfg (original)
+++ cfe/trunk/test/Analysis/lit.local.cfg Wed May 15 13:19:51 2019
@@ -18,7 +18,5 @@ config.substitutions.append(('%diff_plis
 config.substitutions.append(('%diff_sarif',
     '''diff -U1 -w -I ".*file:.*%basename_t" -I '"version":' -I "2\.0\.0\-csd\.[0-9]*\.beta\."'''))
 
-config.excludes.add('plugins')
-
 if not config.root.clang_staticanalyzer:
     config.unsupported = True

Modified: cfe/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CMakeLists.txt?rev=360805&r1=360804&r2=360805&view=diff
==============================================================================
--- cfe/trunk/test/CMakeLists.txt (original)
+++ cfe/trunk/test/CMakeLists.txt Wed May 15 13:19:51 2019
@@ -139,15 +139,13 @@ if (CLANG_ENABLE_STATIC_ANALYZER)
   # check-all would launch those tests via check-clang.
   set(EXCLUDE_FROM_ALL ON)
 
-  add_subdirectory(Analysis/plugins)
-  list(APPEND CLANG_TEST_DEPS clang-analyzer-plugin)
-
   add_lit_testsuite(check-clang-analyzer "Running the Clang analyzer tests"
     ${CMAKE_CURRENT_BINARY_DIR}/Analysis
     PARAMS ${ANALYZER_TEST_PARAMS}
     DEPENDS ${CLANG_TEST_DEPS})
   set_target_properties(check-clang-analyzer PROPERTIES FOLDER "Clang tests")
 
+
   if (LLVM_WITH_Z3)
     add_lit_testsuite(check-clang-analyzer-z3 "Running the Clang analyzer tests, using Z3 as a solver"
       ${CMAKE_CURRENT_BINARY_DIR}/Analysis