Index: clang-tools-extra/trunk/test/CMakeLists.txt =================================================================== --- clang-tools-extra/trunk/test/CMakeLists.txt +++ clang-tools-extra/trunk/test/CMakeLists.txt @@ -20,13 +20,17 @@ CLANGD_BUILD_XPC_SUPPORT) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/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 ) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg + ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py + MAIN_CONFIG + ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.cfg.py ) option(CLANG_TOOLS_TEST_USE_VG "Run Clang tools' tests under Valgrind" OFF) Index: clang-tools-extra/trunk/test/Unit/lit.cfg =================================================================== --- clang-tools-extra/trunk/test/Unit/lit.cfg +++ clang-tools-extra/trunk/test/Unit/lit.cfg @@ -1,37 +0,0 @@ -# -*- Python -*- - -import platform - -import lit.formats - -config.name = "Extra Tools Unit Tests" -config.suffixes = [] # Seems not to matter for google tests? - -# Test Source and Exec root dirs both point to the same directory where google -# test binaries are built. - -config.test_source_root = config.extra_tools_obj_dir -config.test_exec_root = config.test_source_root - -# All GoogleTests are named to have 'Tests' as their suffix. The '.' option is -# a special value for GoogleTest indicating that it should look through the -# entire testsuite recursively for tests (alternatively, one could provide a -# ;-separated list of subdirectories). -config.test_format = lit.formats.GoogleTest('.', 'Tests') - -if platform.system() == 'Darwin': - shlibpath_var = 'DYLD_LIBRARY_PATH' -elif platform.system() == 'Windows': - shlibpath_var = 'PATH' -else: - shlibpath_var = 'LD_LIBRARY_PATH' - -# Point the dynamic loader at dynamic libraries in 'lib'. -shlibpath = os.path.pathsep.join((config.shlibdir, config.llvm_libs_dir, - config.environment.get(shlibpath_var,''))) - -# Win32 seeks DLLs along %PATH%. -if sys.platform in ['win32', 'cygwin'] and os.path.isdir(config.shlibdir): - shlibpath = os.path.pathsep.join((config.shlibdir, shlibpath)) - -config.environment[shlibpath_var] = shlibpath Index: clang-tools-extra/trunk/test/Unit/lit.cfg.py =================================================================== --- clang-tools-extra/trunk/test/Unit/lit.cfg.py +++ clang-tools-extra/trunk/test/Unit/lit.cfg.py @@ -0,0 +1,37 @@ +# -*- Python -*- + +import platform + +import lit.formats + +config.name = "Extra Tools Unit Tests" +config.suffixes = [] # Seems not to matter for google tests? + +# Test Source and Exec root dirs both point to the same directory where google +# test binaries are built. + +config.test_source_root = config.extra_tools_obj_dir +config.test_exec_root = config.test_source_root + +# All GoogleTests are named to have 'Tests' as their suffix. The '.' option is +# a special value for GoogleTest indicating that it should look through the +# entire testsuite recursively for tests (alternatively, one could provide a +# ;-separated list of subdirectories). +config.test_format = lit.formats.GoogleTest('.', 'Tests') + +if platform.system() == 'Darwin': + shlibpath_var = 'DYLD_LIBRARY_PATH' +elif platform.system() == 'Windows': + shlibpath_var = 'PATH' +else: + shlibpath_var = 'LD_LIBRARY_PATH' + +# Point the dynamic loader at dynamic libraries in 'lib'. +shlibpath = os.path.pathsep.join((config.shlibdir, config.llvm_libs_dir, + config.environment.get(shlibpath_var,''))) + +# Win32 seeks DLLs along %PATH%. +if sys.platform in ['win32', 'cygwin'] and os.path.isdir(config.shlibdir): + shlibpath = os.path.pathsep.join((config.shlibdir, shlibpath)) + +config.environment[shlibpath_var] = shlibpath Index: clang-tools-extra/trunk/test/Unit/lit.site.cfg.in =================================================================== --- clang-tools-extra/trunk/test/Unit/lit.site.cfg.in +++ clang-tools-extra/trunk/test/Unit/lit.site.cfg.in @@ -1,9 +0,0 @@ -@LIT_SITE_CFG_IN_HEADER@ - -config.extra_tools_obj_dir = "@CLANG_TOOLS_BINARY_DIR@/unittests" -config.extra_tools_src_dir = "@CLANG_TOOLS_SOURCE_DIR@/unittests" -config.llvm_libs_dir = "@LLVM_LIBS_DIR@" -config.shlibdir = "@SHLIBDIR@" -config.target_triple = "@TARGET_TRIPLE@" - -lit_config.load_config(config, "@CLANG_TOOLS_SOURCE_DIR@/test/Unit/lit.cfg") Index: clang-tools-extra/trunk/test/Unit/lit.site.cfg.py.in =================================================================== --- clang-tools-extra/trunk/test/Unit/lit.site.cfg.py.in +++ clang-tools-extra/trunk/test/Unit/lit.site.cfg.py.in @@ -0,0 +1,9 @@ +@LIT_SITE_CFG_IN_HEADER@ + +config.extra_tools_obj_dir = "@CLANG_TOOLS_BINARY_DIR@/unittests" +config.extra_tools_src_dir = "@CLANG_TOOLS_SOURCE_DIR@/unittests" +config.llvm_libs_dir = "@LLVM_LIBS_DIR@" +config.shlibdir = "@SHLIBDIR@" +config.target_triple = "@TARGET_TRIPLE@" + +lit_config.load_config(config, "@CLANG_TOOLS_SOURCE_DIR@/test/Unit/lit.cfg.py") Index: clang-tools-extra/trunk/test/lit.cfg =================================================================== --- clang-tools-extra/trunk/test/lit.cfg +++ clang-tools-extra/trunk/test/lit.cfg @@ -1,145 +0,0 @@ -# -*- Python -*- - -import os -import platform -import re -import subprocess - -import lit.formats -import lit.util - -# Configuration file for the 'lit' test runner. - -# name: The name of this test suite. -config.name = 'Clang Tools' - -# Tweak PATH for Win32 -if platform.system() == 'Windows': - # Seek sane tools in directories and set to $PATH. - path = getattr(config, 'lit_tools_dir', None) - path = lit_config.getToolsPath(path, - config.environment['PATH'], - ['cmp.exe', 'grep.exe', 'sed.exe']) - if path is not None: - path = os.path.pathsep.join((path, - config.environment['PATH'])) - config.environment['PATH'] = path - -# Choose between lit's internal shell pipeline runner and a real shell. If -# LIT_USE_INTERNAL_SHELL is in the environment, we use that as an override. -use_lit_shell = os.environ.get("LIT_USE_INTERNAL_SHELL") -if use_lit_shell: - # 0 is external, "" is default, and everything else is internal. - execute_external = (use_lit_shell == "0") -else: - # Otherwise we default to internal on Windows and external elsewhere, as - # bash on Windows is usually very slow. - execute_external = (not sys.platform in ['win32']) - -# testFormat: The test format to use to interpret tests. -# -# For now we require '&&' between commands, until they get globally killed and -# the test runner updated. -config.test_format = lit.formats.ShTest(execute_external) - -# suffixes: A list of file extensions to treat as test files. -config.suffixes = ['.c', '.cpp', '.hpp', '.m', '.mm', '.cu', '.ll', '.cl', '.s', - '.modularize', '.module-map-checker', '.test'] - -# Test-time dependencies located in directories called 'Inputs' are excluded -# from test suites; there won't be any lit tests within them. -config.excludes = ['Inputs'] - -# test_source_root: The root path where tests are located. -config.test_source_root = os.path.dirname(__file__) - -# test_exec_root: The root path where tests should be run. -config.test_exec_root = os.path.join(config.clang_tools_binary_dir, 'test') - -# Clear some environment variables that might affect Clang. -# -# This first set of vars are read by Clang, but shouldn't affect tests -# that aren't specifically looking for these features, or are required -# simply to run the tests at all. -# -# FIXME: Should we have a tool that enforces this? - -# safe_env_vars = ('TMPDIR', 'TEMP', 'TMP', 'USERPROFILE', 'PWD', -# 'MACOSX_DEPLOYMENT_TARGET', 'IPHONEOS_DEPLOYMENT_TARGET', -# 'IOS_SIMULATOR_DEPLOYMENT_TARGET', -# 'VCINSTALLDIR', 'VC100COMNTOOLS', 'VC90COMNTOOLS', -# 'VC80COMNTOOLS') -possibly_dangerous_env_vars = ['COMPILER_PATH', 'RC_DEBUG_OPTIONS', - 'CINDEXTEST_PREAMBLE_FILE', 'LIBRARY_PATH', - 'CPATH', 'C_INCLUDE_PATH', 'CPLUS_INCLUDE_PATH', - 'OBJC_INCLUDE_PATH', 'OBJCPLUS_INCLUDE_PATH', - 'LIBCLANG_TIMING', 'LIBCLANG_OBJTRACKING', - 'LIBCLANG_LOGGING', 'LIBCLANG_BGPRIO_INDEX', - 'LIBCLANG_BGPRIO_EDIT', 'LIBCLANG_NOTHREADS', - 'LIBCLANG_RESOURCE_USAGE', - 'LIBCLANG_CODE_COMPLETION_LOGGING'] -# Clang/Win32 may refer to %INCLUDE%. vsvarsall.bat sets it. -if platform.system() != 'Windows': - possibly_dangerous_env_vars.append('INCLUDE') -for name in possibly_dangerous_env_vars: - if name in config.environment: - del config.environment[name] - -# Tweak the PATH to include the tools dir and the scripts dir. -path = os.path.pathsep.join(( - config.clang_tools_dir, config.llvm_tools_dir, config.environment['PATH'])) -config.environment['PATH'] = path - -path = os.path.pathsep.join((config.clang_libs_dir, config.llvm_libs_dir, - config.environment.get('LD_LIBRARY_PATH',''))) -config.environment['LD_LIBRARY_PATH'] = path - -# When running under valgrind, we mangle '-vg' onto the end of the triple so we -# can check it with XFAIL and XTARGET. -if lit_config.useValgrind: - config.target_triple += '-vg' - -config.available_features.add('crash-recovery') -# Set available features we allow tests to conditionalize on. -# - -# Shell execution -if execute_external: - config.available_features.add('shell') - -# Exclude MSYS due to transforming '/' to 'X:/mingwroot/'. -if not platform.system() in ['Windows'] or not execute_external: - config.available_features.add('shell-preserves-root') - -# ANSI escape sequences in non-dumb terminal -if platform.system() not in ['Windows']: - config.available_features.add('ansi-escape-sequences') - -# XPC support for Clangd. -if config.clangd_xpc_support: - config.available_features.add('clangd-xpc-support') - -if config.clang_staticanalyzer: - config.available_features.add('static-analyzer') - -check_clang_tidy = os.path.join( - config.test_source_root, "clang-tidy", "check_clang_tidy.py") -config.substitutions.append( - ('%check_clang_tidy', - '%s %s' % (config.python_executable, check_clang_tidy)) ) -clang_tidy_diff = os.path.join( - config.test_source_root, "..", "clang-tidy", "tool", "clang-tidy-diff.py") -config.substitutions.append( - ('%clang_tidy_diff', - '%s %s' % (config.python_executable, clang_tidy_diff)) ) -run_clang_tidy = os.path.join( - config.test_source_root, "..", "clang-tidy", "tool", "run-clang-tidy.py") -config.substitutions.append( - ('%run_clang_tidy', - '%s %s' % (config.python_executable, run_clang_tidy)) ) - -clangd_benchmarks_dir = os.path.join(os.path.dirname(config.clang_tools_dir), - "tools", "clang", "tools", "extra", - "clangd", "benchmarks") -config.substitutions.append(('%clangd-benchmark-dir', - '%s' % (clangd_benchmarks_dir))) Index: clang-tools-extra/trunk/test/lit.cfg.py =================================================================== --- clang-tools-extra/trunk/test/lit.cfg.py +++ clang-tools-extra/trunk/test/lit.cfg.py @@ -0,0 +1,145 @@ +# -*- Python -*- + +import os +import platform +import re +import subprocess + +import lit.formats +import lit.util + +# Configuration file for the 'lit' test runner. + +# name: The name of this test suite. +config.name = 'Clang Tools' + +# Tweak PATH for Win32 +if platform.system() == 'Windows': + # Seek sane tools in directories and set to $PATH. + path = getattr(config, 'lit_tools_dir', None) + path = lit_config.getToolsPath(path, + config.environment['PATH'], + ['cmp.exe', 'grep.exe', 'sed.exe']) + if path is not None: + path = os.path.pathsep.join((path, + config.environment['PATH'])) + config.environment['PATH'] = path + +# Choose between lit's internal shell pipeline runner and a real shell. If +# LIT_USE_INTERNAL_SHELL is in the environment, we use that as an override. +use_lit_shell = os.environ.get("LIT_USE_INTERNAL_SHELL") +if use_lit_shell: + # 0 is external, "" is default, and everything else is internal. + execute_external = (use_lit_shell == "0") +else: + # Otherwise we default to internal on Windows and external elsewhere, as + # bash on Windows is usually very slow. + execute_external = (not sys.platform in ['win32']) + +# testFormat: The test format to use to interpret tests. +# +# For now we require '&&' between commands, until they get globally killed and +# the test runner updated. +config.test_format = lit.formats.ShTest(execute_external) + +# suffixes: A list of file extensions to treat as test files. +config.suffixes = ['.c', '.cpp', '.hpp', '.m', '.mm', '.cu', '.ll', '.cl', '.s', + '.modularize', '.module-map-checker', '.test'] + +# Test-time dependencies located in directories called 'Inputs' are excluded +# from test suites; there won't be any lit tests within them. +config.excludes = ['Inputs'] + +# test_source_root: The root path where tests are located. +config.test_source_root = os.path.dirname(__file__) + +# test_exec_root: The root path where tests should be run. +config.test_exec_root = os.path.join(config.clang_tools_binary_dir, 'test') + +# Clear some environment variables that might affect Clang. +# +# This first set of vars are read by Clang, but shouldn't affect tests +# that aren't specifically looking for these features, or are required +# simply to run the tests at all. +# +# FIXME: Should we have a tool that enforces this? + +# safe_env_vars = ('TMPDIR', 'TEMP', 'TMP', 'USERPROFILE', 'PWD', +# 'MACOSX_DEPLOYMENT_TARGET', 'IPHONEOS_DEPLOYMENT_TARGET', +# 'IOS_SIMULATOR_DEPLOYMENT_TARGET', +# 'VCINSTALLDIR', 'VC100COMNTOOLS', 'VC90COMNTOOLS', +# 'VC80COMNTOOLS') +possibly_dangerous_env_vars = ['COMPILER_PATH', 'RC_DEBUG_OPTIONS', + 'CINDEXTEST_PREAMBLE_FILE', 'LIBRARY_PATH', + 'CPATH', 'C_INCLUDE_PATH', 'CPLUS_INCLUDE_PATH', + 'OBJC_INCLUDE_PATH', 'OBJCPLUS_INCLUDE_PATH', + 'LIBCLANG_TIMING', 'LIBCLANG_OBJTRACKING', + 'LIBCLANG_LOGGING', 'LIBCLANG_BGPRIO_INDEX', + 'LIBCLANG_BGPRIO_EDIT', 'LIBCLANG_NOTHREADS', + 'LIBCLANG_RESOURCE_USAGE', + 'LIBCLANG_CODE_COMPLETION_LOGGING'] +# Clang/Win32 may refer to %INCLUDE%. vsvarsall.bat sets it. +if platform.system() != 'Windows': + possibly_dangerous_env_vars.append('INCLUDE') +for name in possibly_dangerous_env_vars: + if name in config.environment: + del config.environment[name] + +# Tweak the PATH to include the tools dir and the scripts dir. +path = os.path.pathsep.join(( + config.clang_tools_dir, config.llvm_tools_dir, config.environment['PATH'])) +config.environment['PATH'] = path + +path = os.path.pathsep.join((config.clang_libs_dir, config.llvm_libs_dir, + config.environment.get('LD_LIBRARY_PATH',''))) +config.environment['LD_LIBRARY_PATH'] = path + +# When running under valgrind, we mangle '-vg' onto the end of the triple so we +# can check it with XFAIL and XTARGET. +if lit_config.useValgrind: + config.target_triple += '-vg' + +config.available_features.add('crash-recovery') +# Set available features we allow tests to conditionalize on. +# + +# Shell execution +if execute_external: + config.available_features.add('shell') + +# Exclude MSYS due to transforming '/' to 'X:/mingwroot/'. +if not platform.system() in ['Windows'] or not execute_external: + config.available_features.add('shell-preserves-root') + +# ANSI escape sequences in non-dumb terminal +if platform.system() not in ['Windows']: + config.available_features.add('ansi-escape-sequences') + +# XPC support for Clangd. +if config.clangd_xpc_support: + config.available_features.add('clangd-xpc-support') + +if config.clang_staticanalyzer: + config.available_features.add('static-analyzer') + +check_clang_tidy = os.path.join( + config.test_source_root, "clang-tidy", "check_clang_tidy.py") +config.substitutions.append( + ('%check_clang_tidy', + '%s %s' % (config.python_executable, check_clang_tidy)) ) +clang_tidy_diff = os.path.join( + config.test_source_root, "..", "clang-tidy", "tool", "clang-tidy-diff.py") +config.substitutions.append( + ('%clang_tidy_diff', + '%s %s' % (config.python_executable, clang_tidy_diff)) ) +run_clang_tidy = os.path.join( + config.test_source_root, "..", "clang-tidy", "tool", "run-clang-tidy.py") +config.substitutions.append( + ('%run_clang_tidy', + '%s %s' % (config.python_executable, run_clang_tidy)) ) + +clangd_benchmarks_dir = os.path.join(os.path.dirname(config.clang_tools_dir), + "tools", "clang", "tools", "extra", + "clangd", "benchmarks") +config.substitutions.append(('%clangd-benchmark-dir', + '%s' % (clangd_benchmarks_dir))) Index: clang-tools-extra/trunk/test/lit.site.cfg.in =================================================================== --- clang-tools-extra/trunk/test/lit.site.cfg.in +++ clang-tools-extra/trunk/test/lit.site.cfg.in @@ -1,31 +0,0 @@ -@LIT_SITE_CFG_IN_HEADER@ - -import sys - -config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" -config.llvm_libs_dir = "@LLVM_LIBS_DIR@" -config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@" -config.clang_tools_binary_dir = "@CLANG_TOOLS_BINARY_DIR@" -config.clang_tools_dir = "@CLANG_TOOLS_DIR@" -config.clang_libs_dir = "@SHLIBDIR@" -config.python_executable = "@PYTHON_EXECUTABLE@" -config.target_triple = "@TARGET_TRIPLE@" -config.clang_staticanalyzer = @CLANG_ENABLE_STATIC_ANALYZER@ -config.clangd_xpc_support = @CLANGD_BUILD_XPC_SUPPORT@ - -# Support substitution of the tools and libs dirs with user parameters. This is -# used when we can't determine the tool dir at configuration time. -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)) - -import lit.llvm -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") Index: clang-tools-extra/trunk/test/lit.site.cfg.py.in =================================================================== --- clang-tools-extra/trunk/test/lit.site.cfg.py.in +++ clang-tools-extra/trunk/test/lit.site.cfg.py.in @@ -0,0 +1,31 @@ +@LIT_SITE_CFG_IN_HEADER@ + +import sys + +config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" +config.llvm_libs_dir = "@LLVM_LIBS_DIR@" +config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@" +config.clang_tools_binary_dir = "@CLANG_TOOLS_BINARY_DIR@" +config.clang_tools_dir = "@CLANG_TOOLS_DIR@" +config.clang_libs_dir = "@SHLIBDIR@" +config.python_executable = "@PYTHON_EXECUTABLE@" +config.target_triple = "@TARGET_TRIPLE@" +config.clang_staticanalyzer = @CLANG_ENABLE_STATIC_ANALYZER@ +config.clangd_xpc_support = @CLANGD_BUILD_XPC_SUPPORT@ + +# Support substitution of the tools and libs dirs with user parameters. This is +# used when we can't determine the tool dir at configuration time. +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)) + +import lit.llvm +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.py")