浏览代码

* some LONGLOG changes

pierre 26 年之前
父节点
当前提交
57b5128e32
共有 2 个文件被更改,包括 61 次插入15 次删除
  1. 31 8
      tests/Makefile
  2. 30 7
      tests/Makefile.fpc

+ 31 - 8
tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-12 23:32
+# Makefile generated by fpcmake v0.99.13 on 1999-12-13 13:02
 #
 
 defaultrule: info
@@ -265,7 +265,7 @@ endif
 # Users rules
 #####################################################################
 
-DIRS=tf ts tbs tbf test tesi to
+DIRS=tf ts tbs tbf test tesi to webtbs webtbf
 
 all : info
 
@@ -310,6 +310,13 @@ else
 testsuccess:
 	@echo "Test for $(FILE) fails (does not compile) error $(RETVAL)"
 	@echo "Test for $(FILE) fails (does not compile) error $(RETVAL)" >>log
+ifdef LONGLOG
+	@echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" >> longlog
+	@echo "Test for $(FILE) fails (does not compile) error $(RETVAL)" >> longlog
+	@echo "" >> longlog
+	cat $(FILE).log >> longlog
+	@echo "" >> longlog
+endif
 	@echo $(FILE) >> ts_fail
 	@echo $(FILE) >> faillist
 endif
@@ -327,11 +334,17 @@ endif
 ifeq ($(EXERETVAL),0)
 testexecsuccess:
 	@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
 testexecsuccess:
 	@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
+	@echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" >> longlog
+	@echo "Test for exec $(FILE) fails exec error $(EXERETVAL)" >> longlog
+	@echo "" >> longlog
+	cat $(FILE).elg >> longlog
+endif
 endif
 
 ifeq ($(wildcard $(FILE)$(EXEEXT)),$(FILE)$(EXEEXT))
@@ -355,6 +368,9 @@ ifeq ($(wildcard $(FILE)$(PPUEXT)),$(FILE)$(PPUEXT))
 else
 	@echo "No exefile $(FILE)$(EXEEXT)"
 	@echo $(FILE) >> faillist
+ifdef LONGLOG
+	@echo "No exefile $(FILE)$(EXEEXT) was generated" >> longlog
+endif
 endif
 endif
 
@@ -371,6 +387,9 @@ else
 testfail:
 	@echo "Test for $(FILE) fails (does compile and should not)"
 	@echo "Test for $(FILE) fails (does compile and should not)" >> log
+ifdef LONGLOG
+	@echo "Test for $(FILE) fails (does compile and should not)" >> longlog
+endif
 	@echo $(FILE) >> tf_fail
 	@echo $(FILE) >> faillist
 endif
@@ -384,7 +403,7 @@ override OPT+=$(OPTFILE)
 endif
 
 ifndef FILE
-FILE=ts00001.pp
+FILE=ts/ts00001.pp
 endif
 
 testone :
@@ -451,7 +470,7 @@ endif
 clean_fail :
 	-rm -f $(addsuffix .res,$(TS_FAIL_LIST))
 	-rm -f $(addsuffix .ref,$(TF_FAIL_LIST))
-	-rm log
+	-rm log longlog
 
 again : clean_fail $(addsuffix .res,$(TS_FAIL_LIST)) $(addsuffix .ref,$(TF_FAIL_LIST))
 	grep fails log
@@ -460,12 +479,16 @@ all_compilations : allts alltbs allwebtbs alltf alltbf allwebtbf allto alltest a
 	grep fails log
 
 allexec : alltsexec alltbsexec allwebtbsexec alltestexec 
-	grep "fails exec" log
+	grep fails  log
 
 alltestexec: $(patsubst %.pp,%.elg,$(wildcard test/test*.pp))
 
+allfails :
+	grep fails log > fails.log
+
 # these test are interactive
 # no redirection !!!
+
 alltesiexec: $(patsubst %.pp,%.eli,$(wildcard tesi/tesi*.pp))
 
 alltsexec: $(patsubst %.pp,%.elg,$(wildcard ts/ts*.pp))
@@ -493,7 +516,7 @@ ifdef inlinux
 else
 	-rm -f $(addsuffix /*$(EXEEXT),$(DIRS))
 endif
-	-rm -f log faillist ts_fail tf_fail
+	-rm -f log longlog faillist ts_fail tf_fail
 	-rm -f fpcmaked ppas.sh ppas.bat retcode
 
 info :

+ 30 - 7
tests/Makefile.fpc

@@ -10,7 +10,7 @@ none=1
 exts=1
 
 [rules]
-DIRS=tf ts tbs tbf test tesi to
+DIRS=tf ts tbs tbf test tesi to webtbs webtbf
 
 all : info
 
@@ -55,6 +55,13 @@ else
 testsuccess:
 	@echo "Test for $(FILE) fails (does not compile) error $(RETVAL)"
 	@echo "Test for $(FILE) fails (does not compile) error $(RETVAL)" >>log
+ifdef LONGLOG
+	@echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" >> longlog
+	@echo "Test for $(FILE) fails (does not compile) error $(RETVAL)" >> longlog
+	@echo "" >> longlog
+	cat $(FILE).log >> longlog
+	@echo "" >> longlog
+endif
 	@echo $(FILE) >> ts_fail
 	@echo $(FILE) >> faillist
 endif
@@ -72,11 +79,17 @@ endif
 ifeq ($(EXERETVAL),0)
 testexecsuccess:
 	@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
 testexecsuccess:
 	@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
+	@echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" >> longlog
+	@echo "Test for exec $(FILE) fails exec error $(EXERETVAL)" >> longlog
+	@echo "" >> longlog
+	cat $(FILE).elg >> longlog
+endif
 endif
 
 ifeq ($(wildcard $(FILE)$(EXEEXT)),$(FILE)$(EXEEXT))
@@ -100,6 +113,9 @@ ifeq ($(wildcard $(FILE)$(PPUEXT)),$(FILE)$(PPUEXT))
 else
 	@echo "No exefile $(FILE)$(EXEEXT)"
 	@echo $(FILE) >> faillist
+ifdef LONGLOG
+	@echo "No exefile $(FILE)$(EXEEXT) was generated" >> longlog
+endif
 endif
 endif
 
@@ -116,6 +132,9 @@ else
 testfail:
 	@echo "Test for $(FILE) fails (does compile and should not)"
 	@echo "Test for $(FILE) fails (does compile and should not)" >> log
+ifdef LONGLOG
+	@echo "Test for $(FILE) fails (does compile and should not)" >> longlog
+endif
 	@echo $(FILE) >> tf_fail
 	@echo $(FILE) >> faillist
 endif
@@ -129,7 +148,7 @@ override OPT+=$(OPTFILE)
 endif
 
 ifndef FILE
-FILE=ts00001.pp
+FILE=ts/ts00001.pp
 endif
 
 testone :
@@ -196,7 +215,7 @@ endif
 clean_fail :
 	-rm -f $(addsuffix .res,$(TS_FAIL_LIST))
 	-rm -f $(addsuffix .ref,$(TF_FAIL_LIST))
-	-rm log
+	-rm log longlog
 
 again : clean_fail $(addsuffix .res,$(TS_FAIL_LIST)) $(addsuffix .ref,$(TF_FAIL_LIST))
 	grep fails log
@@ -205,12 +224,16 @@ all_compilations : allts alltbs allwebtbs alltf alltbf allwebtbf allto alltest a
 	grep fails log
 
 allexec : alltsexec alltbsexec allwebtbsexec alltestexec 
-	grep "fails exec" log
+	grep fails  log
 
 alltestexec: $(patsubst %.pp,%.elg,$(wildcard test/test*.pp))
 
+allfails :
+	grep fails log > fails.log
+
 # these test are interactive
 # no redirection !!!
+
 alltesiexec: $(patsubst %.pp,%.eli,$(wildcard tesi/tesi*.pp))
 
 alltsexec: $(patsubst %.pp,%.elg,$(wildcard ts/ts*.pp))
@@ -238,7 +261,7 @@ ifdef inlinux
 else
 	-rm -f $(addsuffix /*$(EXEEXT),$(DIRS))
 endif
-	-rm -f log faillist ts_fail tf_fail
+	-rm -f log longlog faillist ts_fail tf_fail
 	-rm -f fpcmaked ppas.sh ppas.bat retcode
 
 info :