changeset 290:7f320313f44e

clean up test in Makefile
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Mon, 01 Feb 2016 10:51:56 +0900
parents 20ed7536784f
children 1b75546ff65f
files regexParser/Makefile
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/regexParser/Makefile	Mon Feb 01 10:30:55 2016 +0900
+++ b/regexParser/Makefile	Mon Feb 01 10:51:56 2016 +0900
@@ -16,6 +16,8 @@
 SUBST = -subset
 
 TESTFILE = test/c.txt
+WC = | wc
+# WC = 
 
 .cc.o:
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -56,19 +58,19 @@
 .SUFFIXES: .cc .o
 
 tSearch: regexParser $(TESTFILE)
-	./regexParser $(SUBSET) -regex $(REGEX) -ts -file $(TESTFILE)
+	./regexParser $(SUBSET) -regex $(REGEX) -ts -file $(TESTFILE) $(WC)
 
 testParallel : parallelSearch $(TESTFILE)
-	./cerium/ceriumGrep $(SUBSET) -regex $(REGEX) -file s$(TESTFILE)
+	./cerium/ceriumGrep $(SUBSET) -regex $(REGEX) -file $(TESTFILE) $(WC)
 
 test2: regexParser $(TESTFILE)
-	./regexParser $(SUBSET) -regex $(REGEX)-file s$(TESTFILE)
+	./regexParser $(SUBSET) -regex $(REGEX)-file $(TESTFILE) $(WC)
 
 seqtest: sequentialSearch $(TESTFILE)
-	./sequentialSearch -file $(TESTFILE)
+	./sequentialSearch -file $(TESTFILE) $(WC)
 
 grepWalk: regexParser $(TESTFILE)
-	./regexParser -$(SUBSET)  -regex $(REGEX)-file $(TESTFILE)
+	./regexParser -$(SUBSET)  -regex $(REGEX)-file $(TESTFILE) $(WC)
 
 sequentialSearch: sequentialSearch.cc regexParser fileread.o
 	./regexParser -seq -subset -regex $(REGEX)