[llvm-commits] [llvm] r48600 - in /llvm/branches/ggreif/parallelized-test: Makefile lib/llvm.exp

[Gabor Greif]

Author: ggreif
Date: Thu Mar 20 10:07:15 2008
New Revision: 48600

URL: http://llvm.org/viewvc/llvm-project?rev=48600&view=rev
Log:
* Makefile: - activate running of generated makefiles
            - be tolerant if dejagnu sets status
* lib/llvm.exp: add missing procedures (provisorically)

Modified:
    llvm/branches/ggreif/parallelized-test/Makefile
    llvm/branches/ggreif/parallelized-test/lib/llvm.exp

Modified: llvm/branches/ggreif/parallelized-test/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/parallelized-test/Makefile?rev=48600&r1=48599&r2=48600&view=diff

==============================================================================
--- llvm/branches/ggreif/parallelized-test/Makefile (original)
+++ llvm/branches/ggreif/parallelized-test/Makefile Thu Mar 20 10:07:15 2008
@@ -41,14 +41,20 @@
 IGNORE_TESTS += $(filter-out $(BINDINGS_TO_BUILD:=.exp),$(ALL_BINDINGS:=.exp))
 
 ifdef IGNORE_TESTS
-RUNTESTFLAGS += --ignore "$(strip $(IGNORE_TESTS))"
+IGNORE_TESTS := $(strip $(IGNORE_TESTS))
+RUNTESTFLAGS += --ignore "$(IGNORE_TESTS)"
 endif
 
 ifneq ($(RUNTEST),)
+%.makefile.out: %.makefile
+	@ $(MAKE) --always-make -C $(dir $<) -f $(notdir $<) $(notdir $@)
+	cat $@
+
 check-local:: site.exp
-	( ulimit -t 600 ; ulimit -d 512000 ; \
+	- ( ulimit -t 600 ; ulimit -d 512000 ; \
 	  PATH="$(LLVMToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH)" \
 	  $(RUNTEST) $(RUNTESTFLAGS) )
+	$(MAKE) -f $(LLVM_SRC_ROOT)/test/Makefile $(addsuffix .out, $(shell find $(CLEANED_TESTSUITE) -name Test.makefile))
 else
 check-local:: site.exp
 	@echo "*** dejagnu not found.  Make sure runtest is in your PATH, then reconfigure llvm."

Modified: llvm/branches/ggreif/parallelized-test/lib/llvm.exp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/parallelized-test/lib/llvm.exp?rev=48600&r1=48599&r2=48600&view=diff

==============================================================================
--- llvm/branches/ggreif/parallelized-test/lib/llvm.exp (original)
+++ llvm/branches/ggreif/parallelized-test/lib/llvm.exp Thu Mar 20 10:07:15 2008
@@ -112,7 +112,9 @@
 	puts $makeFileId "\t@ (echo source \$(LLVM_OBJ_ROOT)/test/site.exp; \\"
 	puts $makeFileId "\t   echo source \$(LLVM_SRC_ROOT)/test/lib/llvm.exp; \\"
 	puts $makeFileId "\t   echo proc fail { msg } { puts '\"FAIL: \$\$msg\"' }; \\"
+	puts $makeFileId "\t   echo proc xfail { msg } { puts '\"XFAIL: \$\$msg\"' }; \\"
 	puts $makeFileId "\t   echo proc pass { msg } { puts '\"PASS: \$\$msg\"' }; \\"
+	puts $makeFileId "\t   echo proc xpass { msg } { puts '\"XPASS: \$\$msg\"' }; \\"
 	puts $makeFileId "\t   echo proc verbose { msg level } { puts '\"\$\$msg\"' }; \\"
 	puts $makeFileId "\t   echo set subdir \$(SUBDIR); \\"