Stop passing site cfg files via --param to llvm-lit.

[thakis]

Summary

This has been unnecessary since https://reviews.llvm.org/D37756.

https://reviews.llvm.org/D37838 removed it for llvm.

This removes it for clang, lld, clang-tools-extra (and for the GN build).

No intended behavior change.

[hans]

lgtm

clang/test/CMakeLists.txt

113

This and ANALYZER_TEST_PARAMS_Z3 are just dropped because they're unused, right?

[thakis]

Thanks!

clang/test/CMakeLists.txt

113

Yes. It looks like the uses of them were dropped accidentally in D62445. If we restore the uses, we can restore this too.

clang-tools-extra/clangd/test/CMakeLists.txt

 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
   MAIN_CONFIG
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py
   )
 
 add_lit_testsuite(check-clangd "Running the Clangd regression tests"
+  # clangd doesn't put unittest configs in test/unit like every other project.
+  # Because of that, this needs to pass two folders here, while every other
+  # project only needs to pass CMAKE_CURRENT_BINARY_DIR.
   ${CMAKE_CURRENT_BINARY_DIR}/../unittests;${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS ${CLANGD_TEST_DEPS})

clang/test/CMakeLists.txt

list(APPEND CLANG_TEST_DEPS
     Attribute
     AnnotateFunctions
     clang-interpreter
     PrintFunctionNames
     )
 endif ()
 
 set(CLANG_TEST_PARAMS
-  clang_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
   USE_Z3_SOLVER=0
   )
 
-set(ANALYZER_TEST_PARAMS
-  USE_Z3_SOLVER=0)
-
-set(ANALYZER_TEST_PARAMS_Z3
-  USE_Z3_SOLVER=1)
-
 if( NOT CLANG_BUILT_STANDALONE )
   list(APPEND CLANG_TEST_DEPS
     llvm-config
     FileCheck count not
     llc
     llvm-as
     llvm-bcanalyzer
     llvm-cat

lld/test/CMakeLists.txt

list(APPEND LLD_TEST_DEPS
     llvm-pdbutil llvm-readelf llvm-readobj not obj2yaml opt yaml2obj
     )
 endif()
 
 if (LLVM_INCLUDE_TESTS)
   list(APPEND LLD_TEST_DEPS LLDUnitTests)
 endif()
 
-set(LLD_TEST_PARAMS
-  lld_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
-  )
-
 add_lit_testsuite(check-lld "Running lld test suite"
   ${CMAKE_CURRENT_BINARY_DIR}
-  PARAMS lld_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
-       lld_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
   DEPENDS ${LLD_TEST_DEPS}
   )
 
 add_custom_target(lld-test-depends DEPENDS ${LLD_TEST_DEPS})
 set_target_properties(lld-test-depends PROPERTIES FOLDER "lld tests")
 
 add_lit_testsuites(LLD ${CMAKE_CURRENT_SOURCE_DIR}
-  PARAMS lld_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
-       lld_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
   DEPENDS ${LLD_TEST_DEPS}
   )
 
 set_target_properties(check-lld PROPERTIES FOLDER "lld tests")
 
 # Add a legacy target spelling: lld-test
 add_custom_target(lld-test)
 add_dependencies(lld-test check-lld)
 set_target_properties(lld-test PROPERTIES FOLDER "lld tests")

llvm/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn

 }
 
 write_lit_config("lit_site_cfg") {
   # Fully-qualified instead of relative for LIT_SITE_CFG_IN_HEADER.
   input = "//clang-tools-extra/clangd/test/lit.site.cfg.py.in"
   output = clangd_lit_site_cfg_file
 
   extra_values = [
-    "CMAKE_CURRENT_BINARY_DIR=" + rebase_path(
-            get_label_info("//clang-tools-extra/clangd/test", "target_out_dir")),
+    "CMAKE_CURRENT_BINARY_DIR=" +
+        rebase_path(get_label_info("//clang-tools-extra/clangd/test",
+                                   "target_out_dir")),
     "CMAKE_CURRENT_SOURCE_DIR=" +
         rebase_path("//clang-tools-extra/clangd/test"),
 
     "CLANG_LIBS_DIR=",  # needed only for shared builds
     "CLANG_TOOLS_DIR=",
     "LLVM_HOST_TRIPLE=$llvm_current_triple",
     "LLVM_LIT_TOOLS_DIR=",  # Intentionally empty, matches cmake build.
     "LLVM_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),

 
 action("check-clangd") {
   script = "$root_out_dir/bin/llvm-lit"
   if (host_os == "win") {
     script += ".py"
   }
   args = [
     "-sv",
+
+    # clangd doesn't put unittest configs in test/unit like every other project.
+    # Because of that, this needs to pass two folders here, while every other
+    # project only needs to pass CMAKE_CURRENT_BINARY_DIR.
     rebase_path(get_path_info(clangd_lit_site_cfg_file, "dir"), root_out_dir),
     rebase_path(get_path_info(clangd_lit_unit_site_cfg_file, "dir"),
                 root_out_dir),
   ]
   outputs = [ "$target_gen_dir/run-lit" ]  # Non-existing, so that ninja runs it
                                            # each time.
 
   # Since check-clangd is always dirty, //:default doesn't depend on it so
   # that it's not part of the default ninja target.  Hence, check-clangd
   # shouldn't have any deps except :test. so that the default target is sure to
   # build all the deps.
   deps = [ ":test" ]
   testonly = true
 
   pool = "//:console"
 }

llvm/utils/gn/secondary/clang-tools-extra/test/BUILD.gn

 
 action("check-clang-tools") {
   script = "$root_out_dir/bin/llvm-lit"
   if (host_os == "win") {
     script += ".py"
   }
   args = [
     "-sv",
-    "--param",
-    "clang_site_config=" +
-        rebase_path(clang_tools_extra_lit_site_cfg_file, root_out_dir),
-    "--param",
-    "clang_unit_site_config=" +
-        rebase_path(clang_tools_extra_lit_unit_site_cfg_file, root_out_dir),
     rebase_path(".", root_out_dir),
   ]
   outputs = [ "$target_gen_dir/run-lit" ]  # Non-existing, so that ninja runs it
                                            # each time.
 
   # Since check-clang-tools is always dirty, //:default doesn't depend on it so
   # that it's not part of the default ninja target.  Hence, check-clang-tools
   # shouldn't have any deps except :test. so that the default target is sure to
   # build all the deps.
   deps = [ ":test" ]
   testonly = true
 
   pool = "//:console"
 }

llvm/utils/gn/secondary/clang/test/BUILD.gn

 
 action("check-clang") {
   script = "$root_out_dir/bin/llvm-lit"
   if (host_os == "win") {
     script += ".py"
   }
   args = [
     "-sv",
-    "--param",
-    "clang_site_config=" + rebase_path(clang_lit_site_cfg_file, root_out_dir),
-    "--param",
-    "clang_unit_site_config=" +
-        rebase_path(clang_lit_unit_site_cfg_file, root_out_dir),
     rebase_path(".", root_out_dir),
   ]
   outputs = [ "$target_gen_dir/run-lit" ]  # Non-existing, so that ninja runs it
                                            # each time.
 
   # Since check-clang is always dirty, //:default doesn't depend on it so that
   # it's not part of the default ninja target.  Hence, check-clang shouldn't
   # have any deps except :test. so that the default target is sure to build
   # all the deps.
   deps = [ ":test" ]
   testonly = true
 
   pool = "//:console"
 }

llvm/utils/gn/secondary/lld/test/BUILD.gn

 # This is the action that runs all of lld's tests, check-lld.
 action("check-lld") {
   script = "$root_out_dir/bin/llvm-lit"
   if (host_os == "win") {
     script += ".py"
   }
   args = [
     "-sv",
-    "--param",
-    "lld_site_config=" + rebase_path(lld_lit_site_cfg_file, root_out_dir),
-    "--param",
-    "lld_unit_site_config=" +
-        rebase_path(lld_lit_unit_site_cfg_file, root_out_dir),
     rebase_path(".", root_out_dir),
   ]
   outputs = [ "$target_gen_dir/run-lit" ]  # Non-existing, so that ninja runs it
                                            # each time.
 
   # Since check-lld is always dirty, //:default doesn't depend on it so that
   # it's not part of the default ninja target.  Hence, check-lld shouldn't
   # have any deps except :test, so that the default target is sure to build
   # all the deps.
   deps = [ ":test" ]
   testonly = true
 
   pool = "//:console"
 }

llvm/utils/gn/secondary/llvm/test/BUILD.gn

 
 action("check-llvm") {
   script = "$root_out_dir/bin/llvm-lit"
   if (host_os == "win") {
     script += ".py"
   }
   args = [
     "-sv",
-    "--param",
-    "llvm_site_config=" + rebase_path(llvm_lit_site_cfg_file, root_out_dir),
-    "--param",
-    "llvm_unit_site_config=" +
-        rebase_path(llvm_lit_unit_site_cfg_file, root_out_dir),
     rebase_path(".", root_out_dir),
   ]
   outputs = [ "$target_gen_dir/run-lit" ]  # Non-existing, so that ninja runs it
                                            # each time.
 
   # Since check-llvm is always dirty, //:default doesn't depend on it so that
   # it's not part of the default ninja target.  Hence, check-llvm shouldn't
   # have any deps except :test. so that the default target is sure to build
   # all the deps.
   deps = [ ":test" ]
   testonly = true
 
   pool = "//:console"
 }