summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2017-09-21 17:38:13 +0000
committerZachary Turner <zturner@google.com>2017-09-21 17:38:13 +0000
commitbbe23ae675c9e601382dff6a52e015b0c4e938b0 (patch)
tree414977e7b4b06f0f35db622262e2a2286afc8ff3
parent280f1337736b3a3f35560cb31d43bfe01d88d57d (diff)
downloadbcm5719-llvm-bbe23ae675c9e601382dff6a52e015b0c4e938b0.tar.gz
bcm5719-llvm-bbe23ae675c9e601382dff6a52e015b0c4e938b0.zip
[lit] Rename lld and clang lit configs to end in .py
This follows in line with a previous patch of renaming LLVM's. Working on these files is difficult in certain operating systems and/or environments that don't like handling python code with a non .py file extension. llvm-svn: 313892
-rw-r--r--clang/test/CMakeLists.txt12
-rw-r--r--clang/test/Unit/lit.cfg.py (renamed from clang/test/Unit/lit.cfg)0
-rw-r--r--clang/test/Unit/lit.site.cfg.py.in (renamed from clang/test/Unit/lit.site.cfg.in)2
-rw-r--r--clang/test/lit.cfg.py (renamed from clang/test/lit.cfg)0
-rw-r--r--clang/test/lit.site.cfg.py.in (renamed from clang/test/lit.site.cfg.in)2
-rw-r--r--lld/test/CMakeLists.txt13
-rw-r--r--lld/test/Unit/lit.cfg.py (renamed from lld/test/Unit/lit.cfg)0
-rw-r--r--lld/test/Unit/lit.site.cfg.py.in (renamed from lld/test/Unit/lit.site.cfg.in)2
-rw-r--r--lld/test/lit.cfg.py (renamed from lld/test/lit.cfg)0
-rw-r--r--lld/test/lit.site.cfg.py.in (renamed from lld/test/lit.site.cfg.in)2
10 files changed, 21 insertions, 12 deletions
diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt
index a3a70282a7d..9bc733bc775 100644
--- a/clang/test/CMakeLists.txt
+++ b/clang/test/CMakeLists.txt
@@ -26,13 +26,17 @@ llvm_canonicalize_cmake_booleans(
HAVE_LIBZ)
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_TEST_USE_VG "Run Clang tests under Valgrind" OFF)
diff --git a/clang/test/Unit/lit.cfg b/clang/test/Unit/lit.cfg.py
index c4794ccbe58..c4794ccbe58 100644
--- a/clang/test/Unit/lit.cfg
+++ b/clang/test/Unit/lit.cfg.py
diff --git a/clang/test/Unit/lit.site.cfg.in b/clang/test/Unit/lit.site.cfg.py.in
index c2f81463f23..715b4d93f58 100644
--- a/clang/test/Unit/lit.site.cfg.in
+++ b/clang/test/Unit/lit.site.cfg.py.in
@@ -25,4 +25,4 @@ except KeyError:
lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
# Let the main config do the real work.
-lit_config.load_config(config, "@CLANG_SOURCE_DIR@/test/Unit/lit.cfg")
+lit_config.load_config(config, "@CLANG_SOURCE_DIR@/test/Unit/lit.cfg.py")
diff --git a/clang/test/lit.cfg b/clang/test/lit.cfg.py
index f1bb4578dc0..f1bb4578dc0 100644
--- a/clang/test/lit.cfg
+++ b/clang/test/lit.cfg.py
diff --git a/clang/test/lit.site.cfg.in b/clang/test/lit.site.cfg.py.in
index 3df69fb35ec..5d75ea4f32b 100644
--- a/clang/test/lit.site.cfg.in
+++ b/clang/test/lit.site.cfg.py.in
@@ -42,4 +42,4 @@ except KeyError:
@LIT_SITE_CFG_IN_FOOTER@
# Let the main config do the real work.
-lit_config.load_config(config, "@CLANG_SOURCE_DIR@/test/lit.cfg")
+lit_config.load_config(config, "@CLANG_SOURCE_DIR@/test/lit.cfg.py")
diff --git a/lld/test/CMakeLists.txt b/lld/test/CMakeLists.txt
index 6e4de148d7f..eb8475881de 100644
--- a/lld/test/CMakeLists.txt
+++ b/lld/test/CMakeLists.txt
@@ -17,11 +17,16 @@ llvm_canonicalize_cmake_booleans(
HAVE_LIBZ)
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
)
set(LLD_TEST_DEPS lld)
diff --git a/lld/test/Unit/lit.cfg b/lld/test/Unit/lit.cfg.py
index dac9f5dc6c3..dac9f5dc6c3 100644
--- a/lld/test/Unit/lit.cfg
+++ b/lld/test/Unit/lit.cfg.py
diff --git a/lld/test/Unit/lit.site.cfg.in b/lld/test/Unit/lit.site.cfg.py.in
index 30e8933eb5f..cc12117ad0b 100644
--- a/lld/test/Unit/lit.site.cfg.in
+++ b/lld/test/Unit/lit.site.cfg.py.in
@@ -24,4 +24,4 @@ except KeyError as e:
lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
# Let the main config do the real work.
-lit_config.load_config(config, "@LLD_SOURCE_DIR@/test/Unit/lit.cfg")
+lit_config.load_config(config, "@LLD_SOURCE_DIR@/test/Unit/lit.cfg.py")
diff --git a/lld/test/lit.cfg b/lld/test/lit.cfg.py
index f1ee3852a0a..f1ee3852a0a 100644
--- a/lld/test/lit.cfg
+++ b/lld/test/lit.cfg.py
diff --git a/lld/test/lit.site.cfg.in b/lld/test/lit.site.cfg.py.in
index f7bed7d25a8..50593f7d01b 100644
--- a/lld/test/lit.site.cfg.in
+++ b/lld/test/lit.site.cfg.py.in
@@ -25,4 +25,4 @@ except KeyError as e:
@LIT_SITE_CFG_IN_FOOTER@
# Let the main config do the real work.
-lit_config.load_config(config, "@LLD_SOURCE_DIR@/test/lit.cfg")
+lit_config.load_config(config, "@LLD_SOURCE_DIR@/test/lit.cfg.py")
OpenPOWER on IntegriCloud