[llvm-commits] CVS: llvm-test/SingleSource/CustomChecked/Makefile flops.c oopack_v1p8.cpp stepanov_v1p2.cpp

[Reid Spencer]

Changes in directory llvm-test/SingleSource/CustomChecked:

Makefile updated: 1.13 -> 1.14
flops.c updated: 1.5 -> 1.6
oopack_v1p8.cpp updated: 1.3 -> 1.4
stepanov_v1p2.cpp updated: 1.2 -> 1.3
---
Log message:

Excise the need for TestRunner or dejagnu from this directory. These test
cases only need two things: a GREP pattern and special program ARGS. So,
we simply provide that capability contained in this directory. This removes
the dependency of CustomChecked on TestRunner, the vagaries of Tcl and
DejaGnu, etc. 


---
Diffs of the changes:  (+21 -9)

 Makefile          |   23 +++++++++++++++++------
 flops.c           |    2 +-
 oopack_v1p8.cpp   |    3 ++-
 stepanov_v1p2.cpp |    2 +-
 4 files changed, 21 insertions(+), 9 deletions(-)


Index: llvm-test/SingleSource/CustomChecked/Makefile
diff -u llvm-test/SingleSource/CustomChecked/Makefile:1.13 llvm-test/SingleSource/CustomChecked/Makefile:1.14
--- llvm-test/SingleSource/CustomChecked/Makefile:1.13	Fri Nov 10 13:40:33 2006
+++ llvm-test/SingleSource/CustomChecked/Makefile	Wed May 16 16:14:29 2007
@@ -36,24 +36,35 @@
 
 $(PROGRAMS_TO_TEST:%=Output/%.run-lli): \
 Output/%.run-lli: Output/%.llvm.bc $(LLI)
-	-$(TESTRUNR) $(SourceDir)/$(filter $*.%, $(Source)) "$(LLI) $(LLI_OPTS) $<" $@
+	-ARGS=`grep ARGS: $(SourceDir)/$(filter $*.%, $(Source)) | sed 's/.*ARGS://'` ; \
+	GREP=`grep GREP: $(SourceDir)/$(filter $*.%, $(Source)) | sed 's/.*GREP: *//'` ; \
+	$(LLI) $(LLI_OPTS) $< $$ARGS | grep "$$GREP" > $@ ; \
+	if test "$$?" -ne 0 ; then \
+	  echo
 
 $(PROGRAMS_TO_TEST:%=Output/%.run-jit): \
 Output/%.run-jit: Output/%.llvm.bc $(LLI)
-	-$(TESTRUNR) $(SourceDir)/$(filter $*.%, $(Source)) "$(LLI) $(JIT_OPTS) $<" $@
+	-ARGS=`grep ARGS: $(SourceDir)/$(filter $*.%, $(Source)) | sed 's/.*ARGS://'` ; \
+	GREP=`grep GREP: $(SourceDir)/$(filter $*.%, $(Source)) | sed 's/.*GREP: *//'` ; \
+	$(LLI) $(JIT_OPTS) $< $$ARGS | grep "$$GREP" > $@
 
 $(PROGRAMS_TO_TEST:%=Output/%.run-llc): \
 Output/%.run-llc: Output/%.llc
-	-$(TESTRUNR) $(SourceDir)/$(filter $*.%, $(Source)) "$< $(RUN_OPTIONS)" $@
+	-ARGS=`grep ARGS: $(SourceDir)/$(filter $*.%, $(Source)) | sed 's/.*ARGS://'` ; \
+	GREP=`grep GREP: $(SourceDir)/$(filter $*.%, $(Source)) | sed 's/.*GREP: *//'` ; \
+	$< $(RUN_OPTIONS) $$ARGS | grep "$$GREP" > $@
 
 $(PROGRAMS_TO_TEST:%=Output/%.run-llc-ls): \
 Output/%.run-llc-ls: Output/%.llc-ls
-	-$(TESTRUNR) $(SourceDir)/$(filter $*.%, $(Source)) "$< $(RUN_OPTIONS)" $@
+	-ARGS=`grep ARGS: $(SourceDir)/$(filter $*.%, $(Source)) | sed 's/.*ARGS://'` ; \
+	GREP=`grep GREP: $(SourceDir)/$(filter $*.%, $(Source)) | sed 's/.*GREP: *//'` ; \
+	$< $(RUN_OPTIONS) $$ARGS | grep "$$GREP" > $@
 
 $(PROGRAMS_TO_TEST:%=Output/%.run-cbe): \
 Output/%.run-cbe: Output/%.cbe
-	-$(TESTRUNR) $(SourceDir)/$(filter $*.%, $(Source)) "$< $(RUN_OPTIONS)" $@
-
+	-ARGS=`grep ARGS: $(SourceDir)/$(filter $*.%, $(Source)) | sed 's/.*ARGS://'` ; \
+	GREP=`grep GREP: $(SourceDir)/$(filter $*.%, $(Source)) | sed 's/.*GREP: *//'` ; \
+	$< $(RUN_OPTIONS) $$ARGS | grep "$$GREP" > $@
 
 $(PROGRAMS_TO_TEST:%=Output/%.exe-lli): \
 Output/%.exe-lli: Output/%.run-lli


Index: llvm-test/SingleSource/CustomChecked/flops.c
diff -u llvm-test/SingleSource/CustomChecked/flops.c:1.5 llvm-test/SingleSource/CustomChecked/flops.c:1.6
--- llvm-test/SingleSource/CustomChecked/flops.c:1.5	Fri Jun 24 21:50:00 2005
+++ llvm-test/SingleSource/CustomChecked/flops.c	Wed May 16 16:14:29 2007
@@ -1,4 +1,4 @@
-/* RUN: %s | grep 'MFLOPS.4.'
+/* GREP: MFLOPS.4.
  */
 
 /*--------------------- Start flops.c source code ----------------------*/


Index: llvm-test/SingleSource/CustomChecked/oopack_v1p8.cpp
diff -u llvm-test/SingleSource/CustomChecked/oopack_v1p8.cpp:1.3 llvm-test/SingleSource/CustomChecked/oopack_v1p8.cpp:1.4
--- llvm-test/SingleSource/CustomChecked/oopack_v1p8.cpp:1.3	Fri Oct 10 13:19:24 2003
+++ llvm-test/SingleSource/CustomChecked/oopack_v1p8.cpp	Wed May 16 16:14:29 2007
@@ -1,4 +1,5 @@
-// RUN: %s Max=15000 Matrix=200 Complex=20000 Iterator=20000 | grep DONE
+// ARGS: Max=15000 Matrix=200 Complex=20000 Iterator=20000
+// GREP: DONE
 
 //=============================================================================
 //


Index: llvm-test/SingleSource/CustomChecked/stepanov_v1p2.cpp
diff -u llvm-test/SingleSource/CustomChecked/stepanov_v1p2.cpp:1.2 llvm-test/SingleSource/CustomChecked/stepanov_v1p2.cpp:1.3
--- llvm-test/SingleSource/CustomChecked/stepanov_v1p2.cpp:1.2	Sat Oct 18 01:48:19 2003
+++ llvm-test/SingleSource/CustomChecked/stepanov_v1p2.cpp	Wed May 16 16:14:29 2007
@@ -1,4 +1,4 @@
-// RUN: %s | grep 'Abstraction Penalty'
+// GREP: Abstraction Penalty
 /* KAI's version of Stepanov Benchmark -- Version 1.2
 
    Version 1.2 -- removed some special code for GNU systems that