The previous fix of widening divides that trap was too fragile as it depends on custom

[oota-llvm.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index ede1b443174f69d6f671e5d324247a953cc130d1..e7776f8459de05b3b574a964e6560a03cfcb0b68 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -75,6 +75,8 @@ ifdef IGNORE_TESTS
 RUNTESTFLAGS += --ignore "$(strip $(IGNORE_TESTS))"
 endif
 
+# ulimits like these are redundantly enforced by the buildbots, so
+# just removing them here won't work.
 # Both AuroraUX & Solaris do not have the -m flag for ulimit
 ifeq ($(HOST_OS),SunOS)
 ULIMIT=ulimit -t 600 ; ulimit -d 512000 ; ulimit -v 512000 ;
@@ -98,19 +100,11 @@ endif
 
 check-local-lit:: lit.site.cfg Unit/lit.site.cfg
        ( $(ULIMIT) \
-         $(LLVM_SRC_ROOT)/utils/lit/lit.py \
-               --path "$(LLVMToolDir)" \
-               --path "$(LLVM_SRC_ROOT)/test/Scripts" \
-               --path "$(LLVMGCCDIR)/bin" \
-               $(LIT_ARGS) $(LIT_TESTSUITE) )
+         $(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_TESTSUITE) )
 
 check-local-all:: lit.site.cfg Unit/lit.site.cfg extra-lit-site-cfgs
        ( $(ULIMIT) \
-         $(LLVM_SRC_ROOT)/utils/lit/lit.py \
-               --path "$(LLVMToolDir)" \
-               --path "$(LLVM_SRC_ROOT)/test/Scripts" \
-               --path "$(LLVMGCCDIR)/bin" \
-               $(LIT_ARGS) $(LIT_ALL_TESTSUITES) )
+         $(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_ALL_TESTSUITES) )
 
 ifdef TESTONE
 CLEANED_TESTONE := $(patsubst %/,%,$(TESTONE))
@@ -156,9 +150,8 @@ FORCE:
 
 site.exp: FORCE
        @echo 'Making a new site.exp file...'
-       @echo '## these variables are automatically generated by make ##' >site.tmp
-       @echo '# Do not edit here.  If you wish to override these values' >>site.tmp
-       @echo '# edit the last section' >>site.tmp
+       @echo '## Autogenerated by LLVM configuration.' > site.tmp
+       @echo '# Do not edit!' >> site.tmp
        @echo 'set target_triplet "$(TARGET_TRIPLE)"' >> site.tmp
        @echo 'set TARGETS_TO_BUILD "$(TARGETS_TO_BUILD)"' >> site.tmp
        @echo 'set llvmgcc_langs "$(LLVMGCC_LANGS)"' >> site.tmp
@@ -202,15 +195,9 @@ lit.site.cfg: site.exp
 
 Unit/lit.site.cfg: $(PROJ_OBJ_DIR)/Unit/.dir FORCE
        @echo "Making LLVM unittest 'lit.site.cfg' file..."
-       @echo "## Autogenerated by Makefile ##" > $@
-       @echo "# Do not edit!" >> $@
-       @echo >> $@
-       @echo "# Preserve some key paths for use by main LLVM test suite config." >> $@
-       @echo "config.llvm_obj_root = \"\"\"$(LLVM_OBJ_ROOT)\"\"\"" >> $@
-       @echo >> $@
-       @echo "# Remember the build mode." >> $@
-       @echo "config.llvm_build_mode = \"\"\"$(BuildMode)\"\"\"" >> $@
-       @echo >> $@
-       @echo "# Let the main config do the real work." >> $@
-       @echo "lit.load_config(config, \"\"\"$(LLVM_SRC_ROOT)/test/Unit/lit.cfg\"\"\")" >> $@
-
+       @sed -e "s#@LLVM_SOURCE_DIR@#$(LLVM_SRC_ROOT)#g" \
+            -e "s#@LLVM_BINARY_DIR@#$(LLVM_OBJ_ROOT)#g" \
+            -e "s#@LLVM_TOOLS_DIR@#$(ToolDir)#g" \
+            -e "s#@LLVMGCCDIR@#$(LLVMGCCDIR)#g" \
+            -e "s#@LLVM_BUILD_MODE@#$(BuildMode)#g" \
+            $(PROJ_SRC_DIR)/Unit/lit.site.cfg.in > $@