Reverted r132330, r132321, r132320, r132319 as per discussion. Will try in-test requi...

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

diff --git a/test/CodeGen/X86/2009-10-20-GlobalDebug.c b/test/CodeGen/2009-10-20-GlobalDebug.c
similarity index 100%
rename from test/CodeGen/X86/2009-10-20-GlobalDebug.c
rename to test/CodeGen/2009-10-20-GlobalDebug.c

diff --git a/test/Makefile b/test/Makefile
index 157e83f191e2e7ef320b298caebc55903416362b..050c3a51ddec7599fa9f3c262a6842e51239eafb 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -45,7 +45,6 @@ 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
 
@@ -59,7 +58,6 @@ 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 1803294dc6cfd2a8edeba27979f21120f25bb65e..9f4d224eb6558493650a3155a3659d5e23933288 100644 (file)
--- a/test/Unit/lit.site.cfg.in
+++ b/test/Unit/lit.site.cfg.in
@@ -10,12 +10,6 @@ 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 e71785e82310d8c40bb7a58b714fde9f3f2d4901..df90b81055f8b6635f8b3a478bcf7a5443cf30f8 100644 (file)
--- a/test/lit.site.cfg.in
+++ b/test/lit.site.cfg.in
@@ -7,12 +7,6 @@ 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.
-config.excludes = []
-if not 'X86' in config.targets_to_build:
-    config.excludes.append('X86')
 
 # 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.