* fixed makefiles partially for win32

git-svn-id: trunk@5047 -

tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/08/21]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/08/20]
 #
 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
@@ -1379,12 +1379,6 @@ export LOG:=$(TEST_OUTPUTDIR)/log
 endif
 TESTSUBDIRS=cg cg/cdecl units/system units/dos units/crt units/objects units/strings units/sysutils units/math units/sharemem
 TESTDIRS:=test $(addprefix test/,$(TESTSUBDIRS))
-ifneq ($(findstring $(TEST_OS_TARGET),$(UNIXs)),)
-INUNIX=1
-endif
-ifdef INUNIX
-NOGRAPH=1
-endif
 .PHONY: utils units copyfiles testprep
 utils:
 	$(MAKE) -C utils utils
@@ -1397,7 +1391,7 @@ ifndef DOTEST
 DOTEST=utils/dotest
 endif
 ifndef PREPUP
-DOPREP=utils/prepup
+PREPUP=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)
@@ -1507,14 +1501,23 @@ $(TEST_OUTPUTDIR)/dbdigest.cfg:
 	$(ECHOREDIR) "Submitter=$(TEST_USER)" >> $(TEST_OUTPUTDIR)/dbdigest.cfg
 	$(ECHOREDIR) "Machine=$(TEST_HOSTNAME)" >> $(TEST_OUTPUTDIR)/dbdigest.cfg
 	$(ECHOREDIR) "Comment=$(TEST_OPT)" >> $(TEST_OUTPUTDIR)/dbdigest.cfg
+ifndef inWinNT
 $(TEST_OUTPUTDIR)/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
 	cd $(TEST_OUTPUTDIR) && tar cfz $(DB_TARGZ) --files-from=tar.lst
+else
+$(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/dbdigest.cfg
+	cd $(TEST_OUTPUTDIR) && ../../$(PREPUP) $(DB_TARGZ)
+endif
 uploadrun: $(TEST_OUTPUTDIR)/$(DB_TARGZ)
+ifdef inWinNT
+	scp -load "[email protected]" -v $(TEST_OUTPUTDIR)/$(DB_TARGZ) $(DB_HOST):$(DB_UPLOADDIR)/$(DB_TARGZ).part $(SSH_EXTRA)
+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)"
 all : allexectests
 full : clean allexectests digest

tests/Makefile.fpc

@@ -109,16 +109,6 @@ TESTSUBDIRS=cg cg/cdecl units/system units/dos units/crt units/objects units/str
 # All full dirnames in the test/ dir including the subdir self
 TESTDIRS:=test $(addprefix test/,$(TESTSUBDIRS))
 
-# Unix like OS ?
-ifneq ($(findstring $(TEST_OS_TARGET),$(UNIXs)),)
-INUNIX=1
-endif
-
-# For unixes by default no graph tests
-ifdef INUNIX
-NOGRAPH=1
-endif
-
 .PHONY: utils units copyfiles testprep
 
 ################################
@@ -140,7 +130,7 @@ DOTEST=utils/dotest
 endif
 
 ifndef PREPUP
-DOPREP=utils/prepup
+PREPUP=utils/prepup
 endif
 
 
@@ -329,6 +319,7 @@ $(TEST_OUTPUTDIR)/dbdigest.cfg:
         $(ECHOREDIR) "Machine=$(TEST_HOSTNAME)" >> $(TEST_OUTPUTDIR)/dbdigest.cfg
         $(ECHOREDIR) "Comment=$(TEST_OPT)" >> $(TEST_OUTPUTDIR)/dbdigest.cfg
 
+ifndef inWinNT
 $(TEST_OUTPUTDIR)/tar.lst:
         cd $(TEST_OUTPUTDIR) && $(PREPUP) > tar.lst
         $(ECHOREDIR) "log" >> $(TEST_OUTPUTDIR)/tar.lst
@@ -337,8 +328,17 @@ $(TEST_OUTPUTDIR)/tar.lst:
 $(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/tar.lst $(TEST_OUTPUTDIR)/dbdigest.cfg
         cd $(TEST_OUTPUTDIR) && tar cfz $(DB_TARGZ) --files-from=tar.lst
 
+else
+$(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/dbdigest.cfg
+        cd $(TEST_OUTPUTDIR) && ../../$(PREPUP) $(DB_TARGZ)
+endif
+
 uploadrun: $(TEST_OUTPUTDIR)/$(DB_TARGZ)
+ifdef inWinNT
+        scp -load "[email protected]" -v $(TEST_OUTPUTDIR)/$(DB_TARGZ) $(DB_HOST):$(DB_UPLOADDIR)/$(DB_TARGZ).part $(SSH_EXTRA)
+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)"
 
 all : allexectests