* better again also for exec failure

This commit is contained in:
pierre 1999-12-14 22:01:56 +00:00
parent 7c56f630c2
commit 03adfea271
2 changed files with 97 additions and 49 deletions

View File

@ -1,5 +1,5 @@
# #
# Makefile generated by fpcmake v0.99.13 on 1999-12-13 13:02 # Makefile generated by fpcmake v0.99.13 on 1999-12-14 22:55
# #
defaultrule: info defaultrule: info
@ -305,17 +305,17 @@ endif
ifeq ($(RETVAL),0) ifeq ($(RETVAL),0)
testsuccess: testsuccess:
@echo "Test for $(FILE) success (compiles)" @echo "Test for $(FILE) success (compiles)"
@echo "Test for $(FILE) success (compiles)" >>log @echo "Test for $(FILE) success (compiles)" >>$(LOG)
else else
testsuccess: testsuccess:
@echo "Test for $(FILE) fails (does not compile) error $(RETVAL)" @echo "Test for $(FILE) fails (does not compile) error $(RETVAL)"
@echo "Test for $(FILE) fails (does not compile) error $(RETVAL)" >>log @echo "Test for $(FILE) fails (does not compile) error $(RETVAL)" >>$(LOG)
ifdef LONGLOG ifdef LONGLOG
@echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" >> longlog @echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" >> $(LONGLOG)
@echo "Test for $(FILE) fails (does not compile) error $(RETVAL)" >> longlog @echo "Test for $(FILE) fails (does not compile) error $(RETVAL)" >> $(LONGLOG)
@echo "" >> longlog @echo "" >> $(LONGLOG)
cat $(FILE).log >> longlog cat $(FILE).log >> $(LONGLOG)
@echo "" >> longlog @echo "" >> $(LONGLOG)
endif endif
@echo $(FILE) >> ts_fail @echo $(FILE) >> ts_fail
@echo $(FILE) >> faillist @echo $(FILE) >> faillist
@ -334,16 +334,17 @@ endif
ifeq ($(EXERETVAL),0) ifeq ($(EXERETVAL),0)
testexecsuccess: testexecsuccess:
@echo "Test for exec $(FILE) success (runs without error)" @echo "Test for exec $(FILE) success (runs without error)"
@echo "Test for $(FILE) success (runs without error)" >> log @echo "Test for $(FILE) success (runs without error)" >> $(LOG)
else else
testexecsuccess: testexecsuccess:
@echo "Test for exec $(FILE) fails exec error $(EXERETVAL)" @echo "Test for exec $(FILE) fails exec error $(EXERETVAL)"
@echo "Test for exec $(FILE) fails exec error $(EXERETVAL)" >> log @echo "Test for exec $(FILE) fails exec error $(EXERETVAL)" >> $(LOG)
ifdef LONGLOG ifdef LONGLOG
@echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" >> longlog @echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" >> $(LONGLOG)
@echo "Test for exec $(FILE) fails exec error $(EXERETVAL)" >> longlog @echo "Test for exec $(FILE) fails exec error $(EXERETVAL)" >> $(LONGLOG)
@echo "" >> longlog @echo "" >> $(LONGLOG)
cat $(FILE).elg >> longlog cat $(FILE).elg >> $(LONGLOG)
cat $(FILE) >> ex_fail
endif endif
endif endif
@ -369,7 +370,7 @@ else
@echo "No exefile $(FILE)$(EXEEXT)" @echo "No exefile $(FILE)$(EXEEXT)"
@echo $(FILE) >> faillist @echo $(FILE) >> faillist
ifdef LONGLOG ifdef LONGLOG
@echo "No exefile $(FILE)$(EXEEXT) was generated" >> longlog @echo "No exefile $(FILE)$(EXEEXT) was generated" >> $(LONGLOG)
endif endif
endif endif
endif endif
@ -382,18 +383,26 @@ test_exc :
ifneq ($(RETVAL),0) ifneq ($(RETVAL),0)
testfail: testfail:
@echo "Test for $(FILE) success (does not compile) error $(RETVAL)" @echo "Test for $(FILE) success (does not compile) error $(RETVAL)"
@echo "Test for $(FILE) success (does not compile) error $(RETVAL)" >> log @echo "Test for $(FILE) success (does not compile) error $(RETVAL)" >> $(LOG)
else else
testfail: testfail:
@echo "Test for $(FILE) fails (does compile and should not)" @echo "Test for $(FILE) fails (does compile and should not)"
@echo "Test for $(FILE) fails (does compile and should not)" >> log @echo "Test for $(FILE) fails (does compile and should not)" >> $(LOG)
ifdef LONGLOG ifdef LONGLOG
@echo "Test for $(FILE) fails (does compile and should not)" >> longlog @echo "Test for $(FILE) fails (does compile and should not)" >> $(LONGLOG)
endif endif
@echo $(FILE) >> tf_fail @echo $(FILE) >> tf_fail
@echo $(FILE) >> faillist @echo $(FILE) >> faillist
endif endif
ifndef LONGLOG
export LONGLOG:=longlog
endif
ifndef LOG
export LOG:=log
endif
ifdef FILE ifdef FILE
OPTFILE=$(wildcard $(FILE).opt) OPTFILE=$(wildcard $(FILE).opt)
endif endif
@ -467,24 +476,39 @@ export TF_FAIL_LIST
endif endif
endif endif
ifndef EXEC_FAIL_LIST
ifeq ($(wildcard ex_fail*),ex_fail)
EXEC_FAIL_LIST=$(shell cat ex_fail)
export EXEC_FAIL_LIST
endif
endif
clean_fail : clean_fail :
-rm -f $(addsuffix .res,$(TS_FAIL_LIST)) -rm -f $(addsuffix .res,$(TS_FAIL_LIST))
-rm -f $(addsuffix .ref,$(TF_FAIL_LIST)) -rm -f $(addsuffix .ref,$(TF_FAIL_LIST))
-rm log longlog -rm -f $(addsuffix .res,$(EXEC_FAIL_LIST))
-rm -f $(addsuffix .elg,$(EXEC_FAIL_LIST))
again : clean_fail $(addsuffix .res,$(TS_FAIL_LIST)) $(addsuffix .ref,$(TF_FAIL_LIST)) # Test all failure of last time
grep fails log # don't forget to try to run them again
again :
$(MAKE) internal_again LOG=again.log LONGLOG=again.llg
internal_again : clean_fail $(addsuffix .res,$(TS_FAIL_LIST)) \
$(addsuffix .ref,$(TF_FAIL_LIST)) \
$(addsuffix .elg,$(EXEC_FAIL_LIST) $(TS_FAIL_LIST))
grep fails $(LOG)
all_compilations : allts alltbs allwebtbs alltf alltbf allwebtbf allto alltest alltesi alltis all_compilations : allts alltbs allwebtbs alltf alltbf allwebtbf allto alltest alltesi alltis
grep fails log grep fails $(LOG)
allexec : alltsexec alltbsexec allwebtbsexec alltestexec allexec : alltsexec alltbsexec allwebtbsexec alltestexec
grep fails log grep fails $(LOG)
alltestexec: $(patsubst %.pp,%.elg,$(wildcard test/test*.pp)) alltestexec: $(patsubst %.pp,%.elg,$(wildcard test/test*.pp))
allfails : allfails :
grep fails log > fails.log grep fails $(LOG) > fails.log
# these test are interactive # these test are interactive
# no redirection !!! # no redirection !!!
@ -516,7 +540,7 @@ ifdef inlinux
else else
-rm -f $(addsuffix /*$(EXEEXT),$(DIRS)) -rm -f $(addsuffix /*$(EXEEXT),$(DIRS))
endif endif
-rm -f log longlog faillist ts_fail tf_fail -rm -f $(LOG) $(LONGLOG) faillist ts_fail tf_fail
-rm -f fpcmaked ppas.sh ppas.bat retcode -rm -f fpcmaked ppas.sh ppas.bat retcode
info : info :

View File

@ -50,17 +50,17 @@ endif
ifeq ($(RETVAL),0) ifeq ($(RETVAL),0)
testsuccess: testsuccess:
@echo "Test for $(FILE) success (compiles)" @echo "Test for $(FILE) success (compiles)"
@echo "Test for $(FILE) success (compiles)" >>log @echo "Test for $(FILE) success (compiles)" >>$(LOG)
else else
testsuccess: testsuccess:
@echo "Test for $(FILE) fails (does not compile) error $(RETVAL)" @echo "Test for $(FILE) fails (does not compile) error $(RETVAL)"
@echo "Test for $(FILE) fails (does not compile) error $(RETVAL)" >>log @echo "Test for $(FILE) fails (does not compile) error $(RETVAL)" >>$(LOG)
ifdef LONGLOG ifdef LONGLOG
@echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" >> longlog @echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" >> $(LONGLOG)
@echo "Test for $(FILE) fails (does not compile) error $(RETVAL)" >> longlog @echo "Test for $(FILE) fails (does not compile) error $(RETVAL)" >> $(LONGLOG)
@echo "" >> longlog @echo "" >> $(LONGLOG)
cat $(FILE).log >> longlog cat $(FILE).log >> $(LONGLOG)
@echo "" >> longlog @echo "" >> $(LONGLOG)
endif endif
@echo $(FILE) >> ts_fail @echo $(FILE) >> ts_fail
@echo $(FILE) >> faillist @echo $(FILE) >> faillist
@ -79,16 +79,17 @@ endif
ifeq ($(EXERETVAL),0) ifeq ($(EXERETVAL),0)
testexecsuccess: testexecsuccess:
@echo "Test for exec $(FILE) success (runs without error)" @echo "Test for exec $(FILE) success (runs without error)"
@echo "Test for $(FILE) success (runs without error)" >> log @echo "Test for $(FILE) success (runs without error)" >> $(LOG)
else else
testexecsuccess: testexecsuccess:
@echo "Test for exec $(FILE) fails exec error $(EXERETVAL)" @echo "Test for exec $(FILE) fails exec error $(EXERETVAL)"
@echo "Test for exec $(FILE) fails exec error $(EXERETVAL)" >> log @echo "Test for exec $(FILE) fails exec error $(EXERETVAL)" >> $(LOG)
ifdef LONGLOG ifdef LONGLOG
@echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" >> longlog @echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" >> $(LONGLOG)
@echo "Test for exec $(FILE) fails exec error $(EXERETVAL)" >> longlog @echo "Test for exec $(FILE) fails exec error $(EXERETVAL)" >> $(LONGLOG)
@echo "" >> longlog @echo "" >> $(LONGLOG)
cat $(FILE).elg >> longlog cat $(FILE).elg >> $(LONGLOG)
cat $(FILE) >> ex_fail
endif endif
endif endif
@ -114,7 +115,7 @@ else
@echo "No exefile $(FILE)$(EXEEXT)" @echo "No exefile $(FILE)$(EXEEXT)"
@echo $(FILE) >> faillist @echo $(FILE) >> faillist
ifdef LONGLOG ifdef LONGLOG
@echo "No exefile $(FILE)$(EXEEXT) was generated" >> longlog @echo "No exefile $(FILE)$(EXEEXT) was generated" >> $(LONGLOG)
endif endif
endif endif
endif endif
@ -127,18 +128,26 @@ test_exc :
ifneq ($(RETVAL),0) ifneq ($(RETVAL),0)
testfail: testfail:
@echo "Test for $(FILE) success (does not compile) error $(RETVAL)" @echo "Test for $(FILE) success (does not compile) error $(RETVAL)"
@echo "Test for $(FILE) success (does not compile) error $(RETVAL)" >> log @echo "Test for $(FILE) success (does not compile) error $(RETVAL)" >> $(LOG)
else else
testfail: testfail:
@echo "Test for $(FILE) fails (does compile and should not)" @echo "Test for $(FILE) fails (does compile and should not)"
@echo "Test for $(FILE) fails (does compile and should not)" >> log @echo "Test for $(FILE) fails (does compile and should not)" >> $(LOG)
ifdef LONGLOG ifdef LONGLOG
@echo "Test for $(FILE) fails (does compile and should not)" >> longlog @echo "Test for $(FILE) fails (does compile and should not)" >> $(LONGLOG)
endif endif
@echo $(FILE) >> tf_fail @echo $(FILE) >> tf_fail
@echo $(FILE) >> faillist @echo $(FILE) >> faillist
endif endif
ifndef LONGLOG
export LONGLOG:=longlog
endif
ifndef LOG
export LOG:=log
endif
ifdef FILE ifdef FILE
OPTFILE=$(wildcard $(FILE).opt) OPTFILE=$(wildcard $(FILE).opt)
endif endif
@ -212,24 +221,39 @@ export TF_FAIL_LIST
endif endif
endif endif
ifndef EXEC_FAIL_LIST
ifeq ($(wildcard ex_fail*),ex_fail)
EXEC_FAIL_LIST=$(shell cat ex_fail)
export EXEC_FAIL_LIST
endif
endif
clean_fail : clean_fail :
-rm -f $(addsuffix .res,$(TS_FAIL_LIST)) -rm -f $(addsuffix .res,$(TS_FAIL_LIST))
-rm -f $(addsuffix .ref,$(TF_FAIL_LIST)) -rm -f $(addsuffix .ref,$(TF_FAIL_LIST))
-rm log longlog -rm -f $(addsuffix .res,$(EXEC_FAIL_LIST))
-rm -f $(addsuffix .elg,$(EXEC_FAIL_LIST))
again : clean_fail $(addsuffix .res,$(TS_FAIL_LIST)) $(addsuffix .ref,$(TF_FAIL_LIST)) # Test all failure of last time
grep fails log # don't forget to try to run them again
again :
$(MAKE) internal_again LOG=again.log LONGLOG=again.llg
internal_again : clean_fail $(addsuffix .res,$(TS_FAIL_LIST)) \
$(addsuffix .ref,$(TF_FAIL_LIST)) \
$(addsuffix .elg,$(EXEC_FAIL_LIST) $(TS_FAIL_LIST))
grep fails $(LOG)
all_compilations : allts alltbs allwebtbs alltf alltbf allwebtbf allto alltest alltesi alltis all_compilations : allts alltbs allwebtbs alltf alltbf allwebtbf allto alltest alltesi alltis
grep fails log grep fails $(LOG)
allexec : alltsexec alltbsexec allwebtbsexec alltestexec allexec : alltsexec alltbsexec allwebtbsexec alltestexec
grep fails log grep fails $(LOG)
alltestexec: $(patsubst %.pp,%.elg,$(wildcard test/test*.pp)) alltestexec: $(patsubst %.pp,%.elg,$(wildcard test/test*.pp))
allfails : allfails :
grep fails log > fails.log grep fails $(LOG) > fails.log
# these test are interactive # these test are interactive
# no redirection !!! # no redirection !!!
@ -261,7 +285,7 @@ ifdef inlinux
else else
-rm -f $(addsuffix /*$(EXEEXT),$(DIRS)) -rm -f $(addsuffix /*$(EXEEXT),$(DIRS))
endif endif
-rm -f log longlog faillist ts_fail tf_fail -rm -f $(LOG) $(LONGLOG) faillist ts_fail tf_fail
-rm -f fpcmaked ppas.sh ppas.bat retcode -rm -f fpcmaked ppas.sh ppas.bat retcode
info : info :