[llvm-commits] [test-suite] r129530 - in /test-suite/trunk: Makefile.programs Makefile.rules TEST.nightly.Makefile TEST.simple.Makefile

[Andrew Trick]

Author: atrick
Date: Thu Apr 14 14:04:12 2011
New Revision: 129530

URL: http://llvm.org/viewvc/llvm-project?rev=129530&view=rev
Log:
Add a "make build" target to the test-suite.

I use this as follows
make -j8 build TEST=simple ...
make TEST=simple ...

This is the only reasonable way I've come up with for manual
benchmarking. I'm checking in since others have asked for the feature.

Modified:
    test-suite/trunk/Makefile.programs
    test-suite/trunk/Makefile.rules
    test-suite/trunk/TEST.nightly.Makefile
    test-suite/trunk/TEST.simple.Makefile

Modified: test-suite/trunk/Makefile.programs
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.programs?rev=129530&r1=129529&r2=129530&view=diff
==============================================================================
--- test-suite/trunk/Makefile.programs (original)
+++ test-suite/trunk/Makefile.programs Thu Apr 14 14:04:12 2011
@@ -890,6 +890,10 @@
 #
 test:: $(PROGRAMS_TO_TEST:%=test.$(TEST).%)
 
+# Support building with the TEST= option without executing tests.
+# Allows parallel builds to complete before running serial benchmarks.
+build:: $(PROGRAMS_TO_TEST:%=build.$(TEST).%)
+
 # AVAILABLE_TESTS - Compute the set of tests available for user help
 #
 TEST_FILES = $(wildcard $(PROGDIR)/TEST.*.Makefile) \

Modified: test-suite/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.rules?rev=129530&r1=129529&r2=129530&view=diff
==============================================================================
--- test-suite/trunk/Makefile.rules (original)
+++ test-suite/trunk/Makefile.rules Thu Apr 14 14:04:12 2011
@@ -89,6 +89,9 @@
 # Default for install is to at least build everything...
 install ::
 
+# Default rule for build.  It ensures everything has a build rule
+build::
+
 # Default rule for test.  It ensures everything has a test rule
 test::
 
@@ -125,7 +128,7 @@
 # which are marked as Phony.
 #
 .PHONY: all dynamic bytecodelib install-bytecode-library
-.PHONY: clean distclean install test bytecode native prdirs dbg
+.PHONY: clean distclean install build test bytecode native prdirs dbg
 
 ###########################################################################
 # Miscellaneous paths and commands:
@@ -530,7 +533,7 @@
 #---------------------------------------------------------
 
 ifdef DIRS
-all install clean test bytecode native stripped-bytecode install-bytecode::
+all install clean build test bytecode native stripped-bytecode install-bytecode::
 	$(VERB) for dir in ${DIRS}; do \
 		if [ ! -f $$dir/Makefile ]; \
 		then \
@@ -545,6 +548,7 @@
 ifdef PARALLEL_DIRS
 all      :: $(addsuffix /.makeall     , $(PARALLEL_DIRS))
 install  :: $(addsuffix /.makeinstall , $(PARALLEL_DIRS))
+build    :: $(addsuffix /.makebuild   , $(PARALLEL_DIRS))
 clean    :: $(addsuffix /.makeclean   , $(PARALLEL_DIRS))
 test     :: $(addsuffix /.maketest    , $(PARALLEL_DIRS))
 bytecode :: $(addsuffix /.makebytecode, $(PARALLEL_DIRS))
@@ -552,7 +556,7 @@
 stripped-bytecode :: $(addsuffix /.makestripped-bytecode, $(PARALLEL_DIRS))
 install-bytecode :: $(addsuffix /.makeinstall-bytecode, $(PARALLEL_DIRS))
 
-%/.makeall %/.makeinstall %/.makeclean %/.maketest %/.makebytecode \
+%/.makeall %/.makeinstall %/.makeclean %/.makebuild %/.maketest %/.makebytecode \
 %/.makestripped-bytecode %/.makeinstall-bytecode %/.makenative:
 	$(VERB) if [ ! -f $(@D)/Makefile ]; \
 	then \
@@ -564,7 +568,7 @@
 
 # Handle directories that may or may not exist
 ifdef OPTIONAL_DIRS
-all install clean test bytecode stripped-bytecode install-bytecode::
+all install clean build test bytecode stripped-bytecode install-bytecode::
 	$(VERB) for dir in ${OPTIONAL_DIRS}; do \
 		if [ -d $(SourceDir)/$$dir ]; \
 		then\

Modified: test-suite/trunk/TEST.nightly.Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/TEST.nightly.Makefile?rev=129530&r1=129529&r2=129530&view=diff
==============================================================================
--- test-suite/trunk/TEST.nightly.Makefile (original)
+++ test-suite/trunk/TEST.nightly.Makefile Thu Apr 14 14:04:12 2011
@@ -149,3 +149,7 @@
 $(PROGRAMS_TO_TEST:%=test.$(TEST).%): \
 test.$(TEST).%: Output/%.$(TEST).report.txt
 	@-cat $<
+
+$(PROGRAMS_TO_TEST:%=build.$(TEST).%): \
+build.$(TEST).%: Output/%.llc
+	@echo "Finished Building: $<"

Modified: test-suite/trunk/TEST.simple.Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/TEST.simple.Makefile?rev=129530&r1=129529&r2=129530&view=diff
==============================================================================
--- test-suite/trunk/TEST.simple.Makefile (original)
+++ test-suite/trunk/TEST.simple.Makefile Thu Apr 14 14:04:12 2011
@@ -66,3 +66,7 @@
 $(PROGRAMS_TO_TEST:%=test.$(TEST).%): \
 test.$(TEST).%: Output/%.$(TEST).report.txt
 	@-cat $<
+
+$(PROGRAMS_TO_TEST:%=build.$(TEST).%): \
+build.$(TEST).%: Output/%.simple
+	@echo "Finished Building: $<"