* use pascal program to generate the tar list to be more platform independend

git-svn-id: trunk@4975 -

.gitattributes

@@ -6543,6 +6543,7 @@ tests/utils/fail.pp svneol=native#text/plain
 tests/utils/macos/LinkRunDir -text
 tests/utils/macos/LinkRunTests -text
 tests/utils/macos/readme.txt svneol=native#text/plain
+tests/utils/prepup.pp svneol=native#text/plain
 tests/utils/redir.pp svneol=native#text/plain
 tests/utils/testfail.pp svneol=native#text/plain
 tests/utils/tests.sql -text

tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/08/11]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/08/21]
 #
 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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
@@ -1025,7 +1025,7 @@ ifeq ($(CPU_TARGET),powerpc)
 FPCCPUOPT:=-O1r
 endif
 else
-FPCCPUOPT:=-O2
+FPCCPUOPT:=-O1r
 endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
@@ -1396,6 +1396,9 @@ endif
 ifndef DOTEST
 DOTEST=utils/dotest
 endif
+ifndef PREPUP
+DOPREP=utils/prepup
+endif
 units:
 	$(MAKE) -C units FPC_VERSION= FPC=$(TEST_FPC) CPU_TARGET=$(TEST_CPU_TARGET) OS_TARGET=$(TEST_OS_TARGET) OPT="$(TEST_OPT)" CCOMPILER=$(TEST_CCOMPILER) BINUTILSPREFIX=$(TEST_BINUTILSPREFIX)
 copyfiles: $(TEST_OUTPUTDIR)
@@ -1505,7 +1508,7 @@ $(TEST_OUTPUTDIR)/dbdigest.cfg:
 	$(ECHOREDIR) "Machine=$(TEST_HOSTNAME)" >> $(TEST_OUTPUTDIR)/dbdigest.cfg
 	$(ECHOREDIR) "Comment=$(TEST_OPT)" >> $(TEST_OUTPUTDIR)/dbdigest.cfg
 $(TEST_OUTPUTDIR)/tar.lst:
-	cd $(TEST_OUTPUTDIR) && find . -name '*.log' -or -name '*.elg' > tar.lst
+	cd $(TEST_OUTPUTDIR) && $(PREPUP) > tar.lst
 	$(ECHOREDIR) "log" >> $(TEST_OUTPUTDIR)/tar.lst
 	$(ECHOREDIR) "dbdigest.cfg" >> $(TEST_OUTPUTDIR)/tar.lst
 $(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/tar.lst $(TEST_OUTPUTDIR)/dbdigest.cfg

tests/Makefile.fpc

@@ -139,6 +139,10 @@ ifndef DOTEST
 DOTEST=utils/dotest
 endif
 
+ifndef PREPUP
+DOPREP=utils/prepup
+endif
+
 
 ################################
 # Units
@@ -326,7 +330,7 @@ $(TEST_OUTPUTDIR)/dbdigest.cfg:
         $(ECHOREDIR) "Comment=$(TEST_OPT)" >> $(TEST_OUTPUTDIR)/dbdigest.cfg
 
 $(TEST_OUTPUTDIR)/tar.lst:
-        cd $(TEST_OUTPUTDIR) && find . -name '*.log' -or -name '*.elg' > tar.lst
+        cd $(TEST_OUTPUTDIR) && $(PREPUP) > tar.lst
         $(ECHOREDIR) "log" >> $(TEST_OUTPUTDIR)/tar.lst
         $(ECHOREDIR) "dbdigest.cfg" >> $(TEST_OUTPUTDIR)/tar.lst
 

tests/utils/Makefile

@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/04/23]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/08/21]
 #
 default: all
-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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince powerpc64-linux
+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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
@@ -231,121 +231,127 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
+endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest prepup $(DBDIGEST)
 endif
 override INSTALL_FPCPACKAGE=y
 ifdef REQUIRE_UNITSDIR
@@ -669,6 +675,11 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
+ifeq ($(OS_TARGET),gba)
+EXEEXT=.gba
+SHAREDLIBEXT=.so
+SHORTSUFFIX=gba
+endif
 else
 ifeq ($(OS_TARGET),go32v1)
 PPUEXT=.pp1
@@ -737,7 +748,7 @@ endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 PPUEXT=.ppu
-ASMEXT=.asm
+ASMEXT=.s
 OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
@@ -1137,7 +1148,7 @@ ifeq ($(CPU_TARGET),powerpc)
 FPCCPUOPT:=-O1r
 endif
 else
-FPCCPUOPT:=-O2
+FPCCPUOPT:=-O1r
 endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE

tests/utils/Makefile.fpc

@@ -13,7 +13,7 @@ fpcdir=../..
 nortl=y
 
 [target]
-programs=dotest fail testfail digest $(DBDIGEST)
+programs=dotest fail testfail digest prepup $(DBDIGEST)
 
 [clean]
 programs=dbdigest

tests/utils/prepup.pp

@@ -0,0 +1,62 @@
+{
+    This file is part of the Free Pascal test suite.
+    Copyright (c) 2006 by the Free Pascal development team.
+
+    This program collects the results of a testsuite run
+    and prepares things for an upload of the results to the
+    database
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+
+program prepup;
+
+uses
+  sysutils;
+
+
+procedure dosearch(const dir : string);
+
+  procedure domask(const s : string);
+    Var Info : TSearchRec;
+    begin
+      If FindFirst (dir+DirectorySeparator+s,faAnyFile,Info)=0 then
+        begin
+        Repeat
+          With Info do
+            writeln (dir+DirectorySeparator+Name);
+        Until FindNext(info)<>0;
+        end;
+      FindClose(Info);
+   end;
+
+Var Info : TSearchRec;
+
+Begin
+  If FindFirst (dir+DirectorySeparator+'*',faDirectory,Info)=0 then
+    begin
+    Repeat
+      With Info do
+        begin
+          If ((Attr and faDirectory) = faDirectory) and (name<>'.') and (name<>'..') then
+            dosearch(dir+DirectorySeparator+name);
+        end;
+    Until FindNext(info)<>0;
+    end;
+  FindClose(Info);
+  domask('*.elg');
+  domask('*.log');
+End;
+
+begin
+  dosearch('.');
+end.
+
+
+