# HG changeset patch # User Shinji KONO # Date 1454291516 -32400 # Node ID 7f320313f44e9b51937c1cbee4c3ab838fc0b21c # Parent 20ed7536784f634110be290716506757bab04c62 clean up test in Makefile diff -r 20ed7536784f -r 7f320313f44e regexParser/Makefile --- 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)