--- parser3/tests/Makefile 2003/03/06 08:15:39 1.1.2.5 +++ parser3/tests/Makefile 2003/03/06 08:48:59 1.1.2.6 @@ -1,7 +1,11 @@ ifdef COMSPEC - PARSER_EXECUTABLE=../src/targets/cgi/debug/parser3.exe + PARSER_DIR=../src/targets/cgi/debug + PARSER_EXECUTABLE=$(PARSER_DIR)/parser3.exe + PARSER_CONFIG=$(PARSER_DIR)/auto.p else - PARSER_EXECUTABLE=../src/targets/cgi/parser3 + PARSER_DIR=../src/targets/cgi + PARSER_EXECUTABLE=$(PARSER_DIR)/parser3 + PARSER_CONFIG=$(PARSER_DIR)/auto.p endif RUN_PARSER=./run_parser.sh @@ -14,13 +18,13 @@ RM=rm OUTPUTS=$(patsubst %.html,outputs/%.processed,$(wildcard *.html)) RESULTS=$(patsubst %.html,results/%.processed,$(wildcard *.html)) -outputs/%.processed: %.html Makefile $(RUN_PARSER) $(PARSER_EXECUTABLE) +outputs/%.processed: %.html Makefile $(RUN_PARSER) $(PARSER_EXECUTABLE) $(PARSER_CONFIG) $(RUN_PARSER) $(PARSER_EXECUTABLE) $< > $@ .PHONY: FORCE all tests clean results/%.processed: outputs/%.processed FORCE - @$(DIFF) $< $@ + -$(DIFF) $< $@ all: @$(ECHO) this folder contains Parser3 tests, you can run them by command: @@ -31,7 +35,7 @@ tests: outputs compares outputs: $(OUTPUTS) compares: $(RESULTS) - @$(ECHO) All tests passed OK + @$(ECHO) DONE clean: $(RM) -f outputs/*.processed