* also support running the "full" and "fulldb" targets with -jX by

serializing their individual steps

git-svn-id: trunk@21488 -
This commit is contained in:
Jonas Maebe 2012-06-05 14:47:41 +00:00
parent a0facbf1af
commit 8329e60d28
3 changed files with 23 additions and 15 deletions

View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/05/27]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/05/29]
#
default: allexectests
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android
@ -2301,8 +2301,15 @@ else
ssh $(DB_SSH_EXTRA) $(DB_HOST) "mv $(DB_UPLOADDIR)/$(DB_TARGZ).part $(DB_UPLOADDIR)/$(DB_TARGZ)"
endif
all : allexectests
full : clean allexectests digest
fulldb : clean allexectests digest uploadrun
full :
$(MAKE) clean
$(MAKE) allexectests
$(MAKE) digest
fulldb :
$(MAKE) clean
$(MAKE) allexectests
$(MAKE) digest
$(MAKE) uploadrun
tarfile : $(TEST_OUTPUTDIR)/$(DB_TARGZ)
onlyknown :
$(MAKE) full "DOTESTOPT= $(DOTESTOPT) -k-"

View File

@ -623,9 +623,16 @@ endif
all : allexectests
full : clean allexectests digest
full :
$(MAKE) clean
$(MAKE) allexectests
$(MAKE) digest
fulldb : clean allexectests digest uploadrun
fulldb :
$(MAKE) clean
$(MAKE) allexectests
$(MAKE) digest
$(MAKE) uploadrun
tarfile : $(TEST_OUTPUTDIR)/$(DB_TARGZ)

View File

@ -25,17 +25,11 @@ Parallel test suite runs
------------------------
It is possible to run the test suite in parallel, but only when using the
"all" target and only if SINGLEDOTESTRUNS is not used. Under those
circumstances, it is safe to use -jx, with x the number of tests that can
be compiled and run in parallel. E.g.
"all", "full" or "fulldb" targets and only if SINGLEDOTESTRUNS is not used.
Under those circumstances, it is safe to use -jx, with x the number of tests
that can be compiled and run in parallel. E.g.
make all TEST_FPC=path_to_your_compiler -j 2
After running the tests in parallel, you will probably want to get the
summary. This can be achieved making the "digest" target after the "all"
target has finished, e.g.
make digest TEST_FPC=path_to_your_compiler
make full TEST_FPC=path_to_your_compiler -j 2
Make sure to clean the test suite between two runs for the same platform.