* don't rebuild ctest.o implicit, gives troubles under win32

    that has only gcc.exe, but no cc1.exe and other support files
  * fix passing of arguments for win32

git-svn-id: trunk@494 -

tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/05/05]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/03/28]
 #
 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-emx i386-watcom i386-netwlibc 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 arm-linux
@@ -1369,8 +1369,7 @@ ifndef DOTEST
 DOTEST=utils/dotest
 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)
+	$(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)
 	$(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)/ctest.o test/cg
 	-$(MKDIRTREE) $(TEST_OUTPUTDIR)/test/units/system

tests/Makefile.fpc

@@ -145,8 +145,7 @@ 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)
+        $(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)
 
 ################################
 # Copy test environment dependent files ctest.o to test/cg etc

tests/units/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/05/05]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/03/28]
 #
 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-emx i386-watcom i386-netwlibc 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 arm-linux
@@ -1489,7 +1489,7 @@ endif
 DUMMYINSTALLDIR=$(BASEDIR)/tmp
 INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
 rtl-stamp.$(FULL_TARGET):
-	$(MAKE) -C ../../rtl all "OPT=$(OPT) -n"
+	$(MAKE) -C ../../rtl all 'OPT=$(OPT) -n'
 	$(DELTREE) $(COMPILER_TARGETDIR)
 	$(MAKE) -C ../../rtl install $(INSTALLOPT)
 	$(ECHO) Compiled > rtl-stamp.$(FULL_TARGET)
@@ -1510,10 +1510,14 @@ ptest$(PPUEXT) : ../test/cg/ptest.pp
 popuperr$(PPUEXT) : popuperr.pp
 	$(TESTCOMPILER) popuperr.pp
 ifdef CCOMPILER
-../test/cg/obj/$(OS_TARGET)/$(CPU_TARGET)/ctest.o : ../test/cg/obj/ctest.c
+ctest: ../test/cg/obj/ctest.c
 	$(CCOMPILER) -c -o ../test/cg/obj/$(OS_TARGET)/$(CPU_TARGET)/ctest.o ../test/cg/obj/ctest.c
+else
+ctest:
+	@$(ECHO) "No C compiler found"
+	@exit 1
 endif
-extra : erroru$(PPUEXT) ptest$(PPUEXT) popuperr$(PPUEXT) ../test/cg/obj/$(OS_TARGET)/$(CPU_TARGET)/ctest.o
+extra : erroru$(PPUEXT) ptest$(PPUEXT) popuperr$(PPUEXT)
 all : rtl  extra
 clean : cleanrtl cleanall
 clean_ctest :

tests/units/Makefile.fpc

@@ -27,7 +27,7 @@ DUMMYINSTALLDIR=$(BASEDIR)/tmp
 INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
 
 rtl-stamp.$(FULL_TARGET):
-        $(MAKE) -C ../../rtl all "OPT=$(OPT) -n"
+        $(MAKE) -C ../../rtl all 'OPT=$(OPT) -n'
         $(DELTREE) $(COMPILER_TARGETDIR)
         $(MAKE) -C ../../rtl install $(INSTALLOPT)
         $(ECHO) Compiled > rtl-stamp.$(FULL_TARGET)
@@ -61,12 +61,16 @@ popuperr$(PPUEXT) : popuperr.pp
         $(TESTCOMPILER) popuperr.pp
 
 ifdef CCOMPILER
-../test/cg/obj/$(OS_TARGET)/$(CPU_TARGET)/ctest.o : ../test/cg/obj/ctest.c
+ctest: ../test/cg/obj/ctest.c
         $(CCOMPILER) -c -o ../test/cg/obj/$(OS_TARGET)/$(CPU_TARGET)/ctest.o ../test/cg/obj/ctest.c
+else
+ctest:
+        @$(ECHO) "No C compiler found"
+        @exit 1
 endif
 
 
-extra : erroru$(PPUEXT) ptest$(PPUEXT) popuperr$(PPUEXT) ../test/cg/obj/$(OS_TARGET)/$(CPU_TARGET)/ctest.o
+extra : erroru$(PPUEXT) ptest$(PPUEXT) popuperr$(PPUEXT)