[PATCH] D51357: Remove LIT_SITE_CFG_IN_FOOTER.

[Nico Weber via Phabricator via llvm-commits]

thakis created this revision.
thakis added a reviewer: zturner.
Herald added a subscriber: mgorny.

It's always replaced with the same (short) static string, so just put that there directly.

No intended behavior change.


https://reviews.llvm.org/D51357

Files:
  clang-tools-extra/test/lit.site.cfg.in
  clang/test/lit.site.cfg.py.in
  lld/test/lit.site.cfg.py.in
  llvm/cmake/modules/AddLLVM.cmake
  llvm/test/lit.site.cfg.py.in


Index: llvm/test/lit.site.cfg.py.in
===================================================================
--- llvm/test/lit.site.cfg.py.in
+++ llvm/test/lit.site.cfg.py.in
@@ -54,7 +54,8 @@
     key, = e.args
     lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
 
- at LIT_SITE_CFG_IN_FOOTER@
+import lit
+lit.llvm.initialize(lit_config, config)
 
 # Let the main config do the real work.
 lit_config.load_config(config, "@LLVM_SOURCE_DIR@/test/lit.cfg.py")
Index: llvm/cmake/modules/AddLLVM.cmake
===================================================================
--- llvm/cmake/modules/AddLLVM.cmake
+++ llvm/cmake/modules/AddLLVM.cmake
@@ -1243,10 +1243,6 @@
     set(TARGET_TRIPLE "\"+config.target_triple+\"")
   endif()
 
-  string(CONCAT LIT_SITE_CFG_IN_FOOTER
-     "import lit.llvm\n"
-     "lit.llvm.initialize(lit_config, config)\n")
-
   configure_file(${site_in} ${site_out} @ONLY)
   if (EXISTS "${ARG_MAIN_CONFIG}")
     set(PYTHON_STATEMENT "map_config('${ARG_MAIN_CONFIG}', '${site_out}')")
Index: lld/test/lit.site.cfg.py.in
===================================================================
--- lld/test/lit.site.cfg.py.in
+++ lld/test/lit.site.cfg.py.in
@@ -25,7 +25,8 @@
     key, = e.args
     lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
 
- at LIT_SITE_CFG_IN_FOOTER@
+import lit
+lit.llvm.initialize(lit_config, config)
 
 # Let the main config do the real work.
 lit_config.load_config(config, "@LLD_SOURCE_DIR@/test/lit.cfg.py")
Index: clang/test/lit.site.cfg.py.in
===================================================================
--- clang/test/lit.site.cfg.py.in
+++ clang/test/lit.site.cfg.py.in
@@ -40,7 +40,8 @@
     key, = e.args
     lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
 
- at LIT_SITE_CFG_IN_FOOTER@
+import lit
+lit.llvm.initialize(lit_config, config)
 
 # Let the main config do the real work.
 lit_config.load_config(config, "@CLANG_SOURCE_DIR@/test/lit.cfg.py")
Index: clang-tools-extra/test/lit.site.cfg.in
===================================================================
--- clang-tools-extra/test/lit.site.cfg.in
+++ clang-tools-extra/test/lit.site.cfg.in
@@ -23,7 +23,8 @@
     key, = e.args
     lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
 
- at LIT_SITE_CFG_IN_FOOTER@
+import lit
+lit.llvm.initialize(lit_config, config)
 
 # Let the main config do the real work.
 lit_config.load_config(config, "@CLANG_TOOLS_SOURCE_DIR@/test/lit.cfg")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D51357.162859.patch
Type: text/x-patch
Size: 2541 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180828/74311ea6/attachment.bin>