diff --git a/tests/Makefile b/tests/Makefile index 40b228b20c..aa8c400fa3 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/06] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/14] # 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 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 powerpc64-linux powerpc64-embedded @@ -1527,11 +1527,12 @@ $(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/dbdigest.cfg endif uploadrun: $(TEST_OUTPUTDIR)/$(DB_TARGZ) ifdef inWinNT - scp -load "fpc@www.freepascal.org" -v $(TEST_OUTPUTDIR)/$(DB_TARGZ) $(DB_HOST):$(DB_UPLOADDIR)/$(DB_TARGZ).part $(SSH_EXTRA) + pscp -load "fpc@www.freepascal.org" $(TEST_OUTPUTDIR)/$(DB_TARGZ) $(DB_HOST):$(DB_UPLOADDIR)/$(DB_TARGZ).part $(SSH_EXTRA) + plink -load "fpc@www.freepascal.org" "mv $(DB_UPLOADDIR)/$(DB_TARGZ).part $(DB_UPLOADDIR)/$(DB_TARGZ)" else scp $(TEST_OUTPUTDIR)/$(DB_TARGZ) $(DB_HOST):$(DB_UPLOADDIR)/$(DB_TARGZ).part -endif ssh $(DB_HOST) "mv $(DB_UPLOADDIR)/$(DB_TARGZ).part $(DB_UPLOADDIR)/$(DB_TARGZ)" +endif all : allexectests full : clean allexectests digest fulldb : clean allexectests digest uploadrun diff --git a/tests/Makefile.fpc b/tests/Makefile.fpc index fe5c6c966f..ee6280c4f6 100644 --- a/tests/Makefile.fpc +++ b/tests/Makefile.fpc @@ -341,11 +341,12 @@ endif uploadrun: $(TEST_OUTPUTDIR)/$(DB_TARGZ) ifdef inWinNT - scp -load "fpc@www.freepascal.org" -v $(TEST_OUTPUTDIR)/$(DB_TARGZ) $(DB_HOST):$(DB_UPLOADDIR)/$(DB_TARGZ).part $(SSH_EXTRA) + pscp -load "fpc@www.freepascal.org" $(TEST_OUTPUTDIR)/$(DB_TARGZ) $(DB_HOST):$(DB_UPLOADDIR)/$(DB_TARGZ).part $(SSH_EXTRA) + plink -load "fpc@www.freepascal.org" "mv $(DB_UPLOADDIR)/$(DB_TARGZ).part $(DB_UPLOADDIR)/$(DB_TARGZ)" else scp $(TEST_OUTPUTDIR)/$(DB_TARGZ) $(DB_HOST):$(DB_UPLOADDIR)/$(DB_TARGZ).part -endif ssh $(DB_HOST) "mv $(DB_UPLOADDIR)/$(DB_TARGZ).part $(DB_UPLOADDIR)/$(DB_TARGZ)" +endif all : allexectests diff --git a/tests/readme.txt b/tests/readme.txt index 39f73d255f..fbfb48180a 100644 --- a/tests/readme.txt +++ b/tests/readme.txt @@ -175,3 +175,14 @@ Example cross testing of target arm-wince ----------------------------------------- //arm-wince example : see FPCTRUNK\DEMO\WINCE\TESTEMU\ for additional required tools make TEST_FPC=ppcrossarm TEST_CPU_TARGET=arm TEST_OS_TARGET=wince TEST_OPT="-XParm-wince-pe- -WC" EMULATOR=MyDisc:\My\Path\to\wcetemu.exe + +Result uploading +---------------- +Results can be uploaded to the testsuite result DB (http://www.freepascal.org/cgi-bin/testsuite.cgi) by executing +make uploadrun +On unix: +- The testing machine must be enabled to login on www.freepascal.org automatically as user fpc with ssh. +On Windows: +- The putty utilities plink.exe and pscp.exe must be in the patch +- the must be a putty session named fpc@www.freepascal.org which is enabled to login automatically into www.freepascal.org +