This revision was automatically updated to reflect the committed changes. Closed by commit rG61dd0603bd8a: Move update_cc_test_checks.py tests to clang (authored by arichardson).
Changed prior to commit: https://reviews.llvm.org/D74051?vs=243859&id=244650#toc Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D74051/new/ https://reviews.llvm.org/D74051 Files: clang/test/utils/update_cc_test_checks/Inputs/def-and-decl.c clang/test/utils/update_cc_test_checks/Inputs/def-and-decl.c.expected clang/test/utils/update_cc_test_checks/Inputs/mangled_names.c clang/test/utils/update_cc_test_checks/Inputs/mangled_names.c.expected clang/test/utils/update_cc_test_checks/Inputs/mangled_names.c.funcsig.expected clang/test/utils/update_cc_test_checks/def-and-decl.test clang/test/utils/update_cc_test_checks/lit.local.cfg clang/test/utils/update_cc_test_checks/mangled_names.test llvm/test/tools/UpdateTestChecks/lit.local.cfg llvm/test/tools/UpdateTestChecks/update_cc_test_checks/Inputs/def-and-decl.c llvm/test/tools/UpdateTestChecks/update_cc_test_checks/Inputs/def-and-decl.c.expected llvm/test/tools/UpdateTestChecks/update_cc_test_checks/Inputs/mangled_names.c llvm/test/tools/UpdateTestChecks/update_cc_test_checks/Inputs/mangled_names.c.expected llvm/test/tools/UpdateTestChecks/update_cc_test_checks/Inputs/mangled_names.c.funcsig.expected llvm/test/tools/UpdateTestChecks/update_cc_test_checks/def-and-decl.test llvm/test/tools/UpdateTestChecks/update_cc_test_checks/lit.local.cfg llvm/test/tools/UpdateTestChecks/update_cc_test_checks/mangled_names.test Index: llvm/test/tools/UpdateTestChecks/update_cc_test_checks/lit.local.cfg =================================================================== --- llvm/test/tools/UpdateTestChecks/update_cc_test_checks/lit.local.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# These tests require clang. -if 'clang-binary' not in config.available_features: - config.unsupported = True Index: llvm/test/tools/UpdateTestChecks/lit.local.cfg =================================================================== --- llvm/test/tools/UpdateTestChecks/lit.local.cfg +++ llvm/test/tools/UpdateTestChecks/lit.local.cfg @@ -42,11 +42,3 @@ config.available_features.add('llvm-mca-binary') mca_arg = '--llvm-mca-binary ' + shell_quote(llvm_mca_path) add_update_script_substition('%update_test_checks', extra_args=mca_arg) - -clang_path = os.path.join(config.llvm_tools_dir, 'clang') -if os.path.isfile(clang_path): - config.available_features.add('clang-binary') - extra_args = '--clang ' + shell_quote(clang_path) - if os.path.isfile(opt_path): - extra_args += ' --opt ' + shell_quote(opt_path) - add_update_script_substition('%update_cc_test_checks', extra_args=extra_args) Index: clang/test/utils/update_cc_test_checks/lit.local.cfg =================================================================== --- /dev/null +++ clang/test/utils/update_cc_test_checks/lit.local.cfg @@ -0,0 +1,25 @@ +import os + +import lit.util + +# python 2.7 backwards compatibility +try: + from shlex import quote as shell_quote +except ImportError: + from pipes import quote as shell_quote + + +config.test_format = lit.formats.ShTest(execute_external=False) +config.suffixes = ['.test'] + +clang_path = os.path.join(config.clang_tools_dir, 'clang') +extra_args = '--clang ' + shell_quote(clang_path) +opt_path = os.path.join(config.llvm_tools_dir, 'opt') +extra_args += ' --opt ' + shell_quote(opt_path) +script_path = os.path.join(config.llvm_src_root, 'utils', + 'update_cc_test_checks.py') +assert os.path.isfile(script_path) +config.substitutions.append( + ('%update_cc_test_checks', "%s %s %s" % ( + shell_quote(config.python_executable), shell_quote(script_path), + extra_args)))
Index: llvm/test/tools/UpdateTestChecks/update_cc_test_checks/lit.local.cfg =================================================================== --- llvm/test/tools/UpdateTestChecks/update_cc_test_checks/lit.local.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# These tests require clang. -if 'clang-binary' not in config.available_features: - config.unsupported = True Index: llvm/test/tools/UpdateTestChecks/lit.local.cfg =================================================================== --- llvm/test/tools/UpdateTestChecks/lit.local.cfg +++ llvm/test/tools/UpdateTestChecks/lit.local.cfg @@ -42,11 +42,3 @@ config.available_features.add('llvm-mca-binary') mca_arg = '--llvm-mca-binary ' + shell_quote(llvm_mca_path) add_update_script_substition('%update_test_checks', extra_args=mca_arg) - -clang_path = os.path.join(config.llvm_tools_dir, 'clang') -if os.path.isfile(clang_path): - config.available_features.add('clang-binary') - extra_args = '--clang ' + shell_quote(clang_path) - if os.path.isfile(opt_path): - extra_args += ' --opt ' + shell_quote(opt_path) - add_update_script_substition('%update_cc_test_checks', extra_args=extra_args) Index: clang/test/utils/update_cc_test_checks/lit.local.cfg =================================================================== --- /dev/null +++ clang/test/utils/update_cc_test_checks/lit.local.cfg @@ -0,0 +1,25 @@ +import os + +import lit.util + +# python 2.7 backwards compatibility +try: + from shlex import quote as shell_quote +except ImportError: + from pipes import quote as shell_quote + + +config.test_format = lit.formats.ShTest(execute_external=False) +config.suffixes = ['.test'] + +clang_path = os.path.join(config.clang_tools_dir, 'clang') +extra_args = '--clang ' + shell_quote(clang_path) +opt_path = os.path.join(config.llvm_tools_dir, 'opt') +extra_args += ' --opt ' + shell_quote(opt_path) +script_path = os.path.join(config.llvm_src_root, 'utils', + 'update_cc_test_checks.py') +assert os.path.isfile(script_path) +config.substitutions.append( + ('%update_cc_test_checks', "%s %s %s" % ( + shell_quote(config.python_executable), shell_quote(script_path), + extra_args)))
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits