* make testsuite quieter

git-svn-id: trunk@8869 -
This commit is contained in:
micha 2007-10-21 08:45:31 +00:00
parent 45b7358d81
commit cce4c0c1d3
2 changed files with 30 additions and 6 deletions

View File

@ -1,11 +1,12 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/08/22] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/10/17]
# #
default: allexectests default: allexectests
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
BSDs = freebsd netbsd openbsd darwin BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx UNIXs = linux $(BSDs) solaris qnx
LIMIT83fs = go32v2 os2 emx watcom LIMIT83fs = go32v2 os2 emx watcom
OSNeedsComspecToRunBatch = go32v2 watcom
FORCE: FORCE:
.PHONY: FORCE .PHONY: FORCE
override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH)))
@ -56,6 +57,11 @@ else
SRCBATCHEXT=.bat SRCBATCHEXT=.bat
endif endif
endif endif
ifdef COMSPEC
ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),)
RUNBATCH=$(COMSPEC) /C
endif
endif
ifdef inUnix ifdef inUnix
PATHSEP=/ PATHSEP=/
else else
@ -1124,9 +1130,13 @@ ifeq (,$(findstring -s ,$(COMPILER)))
EXECPPAS= EXECPPAS=
else else
ifeq ($(FULL_SOURCE),$(FULL_TARGET)) ifeq ($(FULL_SOURCE),$(FULL_TARGET))
ifdef RUNBATCH
EXECPPAS:=@$(RUNBATCH) $(PPAS)
else
EXECPPAS:=@$(PPAS) EXECPPAS:=@$(PPAS)
endif endif
endif endif
endif
ifdef TARGET_RSTS ifdef TARGET_RSTS
override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS)) override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
override CLEANRSTFILES+=$(RSTFILES) override CLEANRSTFILES+=$(RSTFILES)
@ -1447,6 +1457,11 @@ override DOTESTOPT+=-Z
endif endif
ifdef TEST_VERBOSE ifdef TEST_VERBOSE
override DOTESTOPT+=-V override DOTESTOPT+=-V
Q=
QECHO=
else
Q=@
QECHO=@echo $(1)
endif endif
ifdef TEST_REMOTEOPT ifdef TEST_REMOTEOPT
override DOTESTOPT+="-U$(TEST_REMOTEOPT)" override DOTESTOPT+="-U$(TEST_REMOTEOPT)"
@ -1476,9 +1491,11 @@ DIRS=webtbs webtbf tbs tbf $(TESTDIRS)
vpath %.log $(TEST_OUTPUTDIR) vpath %.log $(TEST_OUTPUTDIR)
vpath %.elg $(TEST_OUTPUTDIR) vpath %.elg $(TEST_OUTPUTDIR)
%.log : %.pp %.log : %.pp
$(DOTEST) $(DOTESTOPT) $< $(call QECHO," COMPILE $<")
$(Q)$(DOTEST) $(DOTESTOPT) $<
%.elg : %.pp %.elg : %.pp
$(DOTEST) $(DOTESTOPT) -e $< $(call QECHO," EXECUTE $<")
$(Q)$(DOTEST) $(DOTESTOPT) -e $<
.PHONY: alltbs alltbf allwebtbs allwebtbf alltest alltests .PHONY: alltbs alltbf allwebtbs allwebtbf alltest alltests
alltbs : testprep $(patsubst %.pp,%.log,$(wildcard tbs/t*.pp)) alltbs : testprep $(patsubst %.pp,%.log,$(wildcard tbs/t*.pp))
alltbf : testprep $(patsubst %.pp,%.log,$(wildcard tbf/t*.pp)) alltbf : testprep $(patsubst %.pp,%.log,$(wildcard tbf/t*.pp))

View File

@ -199,6 +199,11 @@ override DOTESTOPT+=-Z
endif endif
ifdef TEST_VERBOSE ifdef TEST_VERBOSE
override DOTESTOPT+=-V override DOTESTOPT+=-V
Q=
QECHO=
else
Q=@
QECHO=@echo $(1)
endif endif
ifdef TEST_REMOTEOPT ifdef TEST_REMOTEOPT
override DOTESTOPT+="-U$(TEST_REMOTEOPT)" override DOTESTOPT+="-U$(TEST_REMOTEOPT)"
@ -245,10 +250,12 @@ vpath %.log $(TEST_OUTPUTDIR)
vpath %.elg $(TEST_OUTPUTDIR) vpath %.elg $(TEST_OUTPUTDIR)
%.log : %.pp %.log : %.pp
$(DOTEST) $(DOTESTOPT) $< $(call QECHO," COMPILE $<")
$(Q)$(DOTEST) $(DOTESTOPT) $<
%.elg : %.pp %.elg : %.pp
$(DOTEST) $(DOTESTOPT) -e $< $(call QECHO," EXECUTE $<")
$(Q)$(DOTEST) $(DOTESTOPT) -e $<
################################ ################################