Preparations for separating target-specific clang tests.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@132319 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Makefile b/test/Makefile
index 050c3a51ddec7599fa9f3c262a6842e51239eafb..157e83f191e2e7ef320b298caebc55903416362b 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -45,6 +45,7 @@ lit.site.cfg: FORCE
        @$(ECHOPATH) s=@CLANG_SOURCE_DIR@=$(PROJ_SRC_DIR)/..=g >> lit.tmp
        @$(ECHOPATH) s=@CLANG_BINARY_DIR@=$(PROJ_OBJ_DIR)/..=g >> lit.tmp
        @$(ECHOPATH) s=@TARGET_TRIPLE@=$(TARGET_TRIPLE)=g >> lit.tmp
+       @$(ECHOPATH) s=@TARGETS_TO_BUILD@=$(TARGETS_TO_BUILD)=g >> lit.tmp
        @sed -f lit.tmp $(PROJ_SRC_DIR)/lit.site.cfg.in > $@
        @-rm -f lit.tmp
 
@@ -58,6 +59,7 @@ Unit/lit.site.cfg: FORCE
        @$(ECHOPATH) s=@CLANG_SOURCE_DIR@=$(PROJ_SRC_DIR)/..=g >> unit.tmp
        @$(ECHOPATH) s=@CLANG_BINARY_DIR@=$(PROJ_OBJ_DIR)/..=g >> unit.tmp
        @$(ECHOPATH) s=@TARGET_TRIPLE@=$(TARGET_TRIPLE)=g >> unit.tmp
+       @$(ECHOPATH) s=@TARGETS_TO_BUILD@=$(TARGETS_TO_BUILD)=g >> unit.tmp
        @$(ECHOPATH) s=@LLVM_BUILD_MODE@=$(BuildMode)=g >> unit.tmp
        @$(ECHOPATH) s=@ENABLE_SHARED@=$(ENABLE_SHARED)=g >> unit.tmp
        @$(ECHOPATH) s=@SHLIBDIR@=$(SharedLibDir)=g >> unit.tmp

diff --git a/test/Unit/lit.site.cfg.in b/test/Unit/lit.site.cfg.in
index 9f4d224eb6558493650a3155a3659d5e23933288..1803294dc6cfd2a8edeba27979f21120f25bb65e 100644 (file)
--- a/test/Unit/lit.site.cfg.in
+++ b/test/Unit/lit.site.cfg.in
@@ -10,6 +10,12 @@ config.enable_shared = @ENABLE_SHARED@
 config.shlibdir = "@SHLIBDIR@"
 config.shlibpath_var = "@SHLIBPATH_VAR@"
 config.target_triple = "@TARGET_TRIPLE@"
+config.targets_to_build = "@TARGETS_TO_BUILD@"
+
+# Exclude not supported target-specific tests.\r
+config.excludes = []\r
+if not 'X86' in config.targets_to_build:\r
+    config.excludes.append('X86')
 
 # Support substitution of the tools_dir, libs_dirs, and build_mode with user
 # parameters. This is used when we can't determine the tool dir at

diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
index df90b81055f8b6635f8b3a478bcf7a5443cf30f8..c80e663ed087a8eb108c3376b6ad0aacf138c9a4 100644 (file)
--- a/test/lit.site.cfg.in
+++ b/test/lit.site.cfg.in
@@ -7,6 +7,12 @@ config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
 config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
 config.clang_obj_root = "@CLANG_BINARY_DIR@"
 config.target_triple = "@TARGET_TRIPLE@"
+config.targets_to_build = "@TARGETS_TO_BUILD@"
+
+# Exclude not supported target-specific tests.\r
+config.excludes = []\r
+if not 'X86' in config.targets_to_build:\r
+    config.excludes.append('X86')\r
 
 # 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.