Browse Source

* automatic uploading of testsuite results for windows
* documented testsuite uploading

git-svn-id: trunk@5969 -

florian 18 years ago
parent
commit
0738db8856
3 changed files with 18 additions and 5 deletions
  1. 4 3
      tests/Makefile
  2. 3 2
      tests/Makefile.fpc
  3. 11 0
      tests/readme.txt

+ 4 - 3
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
 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
 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
 endif
 uploadrun: $(TEST_OUTPUTDIR)/$(DB_TARGZ)
 uploadrun: $(TEST_OUTPUTDIR)/$(DB_TARGZ)
 ifdef inWinNT
 ifdef inWinNT
-	scp -load "[email protected]" -v $(TEST_OUTPUTDIR)/$(DB_TARGZ) $(DB_HOST):$(DB_UPLOADDIR)/$(DB_TARGZ).part $(SSH_EXTRA)
+	pscp -load "[email protected]" $(TEST_OUTPUTDIR)/$(DB_TARGZ) $(DB_HOST):$(DB_UPLOADDIR)/$(DB_TARGZ).part $(SSH_EXTRA)
+	plink -load "[email protected]" "mv $(DB_UPLOADDIR)/$(DB_TARGZ).part $(DB_UPLOADDIR)/$(DB_TARGZ)"
 else
 else
 	scp $(TEST_OUTPUTDIR)/$(DB_TARGZ) $(DB_HOST):$(DB_UPLOADDIR)/$(DB_TARGZ).part
 	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)"
 	ssh $(DB_HOST) "mv $(DB_UPLOADDIR)/$(DB_TARGZ).part $(DB_UPLOADDIR)/$(DB_TARGZ)"
+endif
 all : allexectests
 all : allexectests
 full : clean allexectests digest
 full : clean allexectests digest
 fulldb : clean allexectests digest uploadrun
 fulldb : clean allexectests digest uploadrun

+ 3 - 2
tests/Makefile.fpc

@@ -341,11 +341,12 @@ endif
 
 
 uploadrun: $(TEST_OUTPUTDIR)/$(DB_TARGZ)
 uploadrun: $(TEST_OUTPUTDIR)/$(DB_TARGZ)
 ifdef inWinNT
 ifdef inWinNT
-        scp -load "[email protected]" -v $(TEST_OUTPUTDIR)/$(DB_TARGZ) $(DB_HOST):$(DB_UPLOADDIR)/$(DB_TARGZ).part $(SSH_EXTRA)
+        pscp -load "[email protected]" $(TEST_OUTPUTDIR)/$(DB_TARGZ) $(DB_HOST):$(DB_UPLOADDIR)/$(DB_TARGZ).part $(SSH_EXTRA)
+        plink -load "[email protected]" "mv $(DB_UPLOADDIR)/$(DB_TARGZ).part $(DB_UPLOADDIR)/$(DB_TARGZ)"
 else
 else
         scp $(TEST_OUTPUTDIR)/$(DB_TARGZ) $(DB_HOST):$(DB_UPLOADDIR)/$(DB_TARGZ).part
         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)"
         ssh $(DB_HOST) "mv $(DB_UPLOADDIR)/$(DB_TARGZ).part $(DB_UPLOADDIR)/$(DB_TARGZ)"
+endif
 
 
 all : allexectests
 all : allexectests
 
 

+ 11 - 0
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
 //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
 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 [email protected] which is enabled to login automatically into www.freepascal.org
+