[cross-project-tests] Rename vars to make sense for new directory name
Differential Revision: https://reviews.llvm.org/D96509
Reviewed by: aprantl
diff --git a/cross-project-tests/lit.cfg.py b/cross-project-tests/lit.cfg.py
index aefe030..9cab3fc 100644
--- a/cross-project-tests/lit.cfg.py
+++ b/cross-project-tests/lit.cfg.py
@@ -1,5 +1,3 @@
-# -*- Python -*-
-
import os
import platform
import re
@@ -15,12 +13,9 @@
# Configuration file for the 'lit' test runner.
# name: The name of this test suite.
-config.name = 'debuginfo-tests'
+config.name = 'cross-project-tests'
# 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(not llvm_config.use_lit_shell)
# suffixes: A list of file extensions to treat as test files.
@@ -32,16 +27,16 @@
config.excludes = ['Inputs']
# test_source_root: The root path where tests are located.
-config.test_source_root = config.debuginfo_tests_src_root
+config.test_source_root = config.cross_project_tests_src_root
# test_exec_root: The root path where tests should be run.
-config.test_exec_root = config.debuginfo_tests_obj_root
+config.test_exec_root = config.cross_project_tests_obj_root
llvm_config.use_default_substitutions()
tools = [
ToolSubst('%test_debuginfo', command=os.path.join(
- config.debuginfo_tests_src_root, 'debuginfo-tests',
+ config.cross_project_tests_src_root, 'debuginfo-tests',
'llgdb-tests', 'test_debuginfo.pl')),
ToolSubst("%llvm_src_root", config.llvm_src_root),
ToolSubst("%llvm_tools_dir", config.llvm_tools_dir),
@@ -126,7 +121,7 @@
# Produce dexter path, lldb path, and combine into the %dexter substitution
# for running a test.
-dexter_path = os.path.join(config.debuginfo_tests_src_root,
+dexter_path = os.path.join(config.cross_project_tests_src_root,
'debuginfo-tests', 'dexter', 'dexter.py')
dexter_test_cmd = '"{}" "{}" test'.format(sys.executable, dexter_path)
if lldb_path is not None:
@@ -173,7 +168,6 @@
lit.util.usePlatformSdkOnDarwin(config, lit_config)
-# available_features: REQUIRES/UNSUPPORTED lit commands look at this list.
if platform.system() == 'Darwin':
xcode_lldb_vers = subprocess.check_output(['xcrun', 'lldb', '--version']).decode("utf-8")
match = re.search('lldb-(\d+)', xcode_lldb_vers)