Remove LIT_SITE_CFG_IN_FOOTER.

[thakis]

Summary

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

No intended behavior change.

[thakis]

r341130 (clang-tools-extra), r341132 (clang), r341134 (lld), and r341135 (llvm). Thanks!

[MatzeB]

I currently see on my machine:

[0/1] Running the LLVM regression tests
llvm-lit: /Users/mbraun/dev/public_llvm/utils/lit/lit/TestingConfig.py:102: fatal: unable to parse config file '/Users/mbraun/dev/public_llvm/build/test/lit.site.cfg.py', traceback: Traceback (most recent call last):
  File "/Users/mbraun/dev/public_llvm/utils/lit/lit/TestingConfig.py", line 89, in load_from_path
    exec(compile(data, path, 'exec'), cfg_globals, None)
  File "/Users/mbraun/dev/public_llvm/build/test/lit.site.cfg.py", line 59, in <module>
    lit.llvm.initialize(lit_config, config)
AttributeError: 'module' object has no attribute 'llvm'

FAILED: test/CMakeFiles/check-llvm
cd /Users/mbraun/dev/public_llvm/build/test && /usr/bin/python2.7 /Users/mbraun/dev/public_llvm/build/./bin/llvm-lit -sv /Users/mbraun/dev/public_llvm/build/test
ninja: build stopped: subcommand failed.

[MaskRay]

In D51357#1220230, @MatzeB wrote:

I currently see on my machine:

[0/1] Running the LLVM regression tests
llvm-lit: /Users/mbraun/dev/public_llvm/utils/lit/lit/TestingConfig.py:102: fatal: unable to parse config file '/Users/mbraun/dev/public_llvm/build/test/lit.site.cfg.py', traceback: Traceback (most recent call last):
  File "/Users/mbraun/dev/public_llvm/utils/lit/lit/TestingConfig.py", line 89, in load_from_path
    exec(compile(data, path, 'exec'), cfg_globals, None)
  File "/Users/mbraun/dev/public_llvm/build/test/lit.site.cfg.py", line 59, in <module>
    lit.llvm.initialize(lit_config, config)
AttributeError: 'module' object has no attribute 'llvm'

FAILED: test/CMakeFiles/check-llvm
cd /Users/mbraun/dev/public_llvm/build/test && /usr/bin/python2.7 /Users/mbraun/dev/public_llvm/build/./bin/llvm-lit -sv /Users/mbraun/dev/public_llvm/build/test
ninja: build stopped: subcommand failed.

- import lit
+ import lit.llvm

I have fixed this

clang-tools-extra/test/lit.site.cfg.in

try:
     config.clang_tools_dir = config.clang_tools_dir % lit_config.params
     config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
     config.llvm_libs_dir = config.llvm_libs_dir % lit_config.params
 except KeyError:
     e = sys.exc_info()[1]
     key, = e.args
     lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
 
-@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")

clang/test/lit.site.cfg.py.in

try:
     config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
     config.llvm_shlib_dir = config.llvm_shlib_dir % lit_config.params
     config.llvm_libs_dir = config.llvm_libs_dir % lit_config.params
 except KeyError:
     e = sys.exc_info()[1]
     key, = e.args
     lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
 
-@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")

lld/test/lit.site.cfg.py.in

 # used when we can't determine the tool dir at configuration time.
 try:
     config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
     config.llvm_libs_dir = config.llvm_libs_dir % lit_config.params
 except KeyError as e:
     key, = e.args
     lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
 
-@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")

llvm/cmake/modules/AddLLVM.cmake

string(CONCAT LIT_SITE_CFG_IN_HEADER "${LIT_SITE_CFG_IN_HEADER}\n\n"
       "target_env = \"${LLVM_TARGET_TRIPLE_ENV}\"\n"
       "config.target_triple = config.environment[target_env] = os.environ.get(target_env, \"${TARGET_TRIPLE}\")\n"
       )
 
     # This is expanded to; config.target_triple = ""+config.target_triple+""
     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}')")
     get_property(LLVM_LIT_CONFIG_MAP GLOBAL PROPERTY LLVM_LIT_CONFIG_MAP)
     set(LLVM_LIT_CONFIG_MAP "${LLVM_LIT_CONFIG_MAP}\n${PYTHON_STATEMENT}")
     set_property(GLOBAL PROPERTY LLVM_LIT_CONFIG_MAP ${LLVM_LIT_CONFIG_MAP})
   endif()
 endfunction()

llvm/test/lit.site.cfg.py.in

 try:
     config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
     config.llvm_shlib_dir = config.llvm_shlib_dir % lit_config.params
 except KeyError:
     e = sys.exc_info()[1]
     key, = e.args
     lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
 
-@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")