--- parser3/tests/Makefile	2003/02/26 10:17:33	1.1.2.1
+++ parser3/tests/Makefile	2016/08/03 20:20:43	1.7
@@ -1,38 +1,45 @@
 ifdef COMSPEC
-	PARSER=../src/targets/cgi/debug/parser3.exe
+	PARSER_DIR=../src/targets/cgi/release
+	PARSER_EXECUTABLE=$(PARSER_DIR)/parser3.exe
 else
-	PARSER=../src/targets/cgi/parser3
+	PARSER_DIR=../src/targets/cgi
+	PARSER_EXECUTABLE=$(PARSER_DIR)/parser3
 endif
+PARSER_CONFIG=results/auto.p
 
-PAFLAGS=-H
-
-#
-
-DIFF=diff
-ECHO=echo
+RUN_PARSER=./run_parser.sh
+DIFF=diff -b
 RM=rm
 
 #
 
-OUTPUTS=$(patsubst %.html,outputs/%.processed,$(wildcard *.html))
-RESULTS=$(patsubst %.html,results/%.processed,$(wildcard *.html))
+COMMON=$(sort $(wildcard ???.html))
+OUTPUTS_COMMON=$(patsubst %.html,outputs/%.processed,$(COMMON))
+RESULTS_COMMON=$(patsubst %.html,results/%.processed,$(COMMON))
+
+CURL=$(sort $(wildcard *-curl.html))
+OUTPUTS_CURL=$(patsubst %.html,outputs/%.processed,$(CURL))
+RESULTS_CURL=$(patsubst %.html,results/%.processed,$(CURL))
+
+SQL=$(sort $(wildcard *-sql.html))
+OUTPUTS_SQL=$(patsubst %.html,outputs/%.processed,$(SQL))
+RESULTS_SQL=$(patsubst %.html,results/%.processed,$(SQL))
 
-outputs/%.processed: %.html Makefile $(PARSER)
-	$(PARSER) $(PAFLAGS) $< > $@
+outputs/%.processed: %.html
+	$(RUN_PARSER) $(PARSER_EXECUTABLE) $< $(PARSER_CONFIG) > $@
 
-.PHONY: FORCE all clean
+.PHONY: FORCE tests tests-curl tests-sql all clean
 
 results/%.processed: outputs/%.processed FORCE
-	@$(DIFF) $< $@
+	-$(DIFF) $@ $<
 
-all: tests
+tests: $(OUTPUTS_COMMON) $(RESULTS_COMMON)
 
-tests: outputs compares
+tests-curl: $(OUTPUTS_CURL) $(RESULTS_CURL)
 
-outputs: $(OUTPUTS)
+tests-sql: $(OUTPUTS_SQL) $(RESULTS_SQL)
 
-compares: $(RESULTS)
-	@$(ECHO) All tests passed OK
+all: tests tests-curl
 
 clean:
 	$(RM) -f outputs/*.processed