* fix for running testsuite for GO32v2 by Giulio Bernardi

git-svn-id: trunk@10834 -
2025-04-20 18:29:28 +02:00 · 2008-04-28 14:39:34 +00:00 · 2008-04-28 14:39:34 +00:00 · 05934cc49d
commit 05934cc49d
parent 78e6388073
4 changed files with 122 additions and 70 deletions
--- a/tests/Makefile
+++ b/tests/Makefile
@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/04/10]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/04/18]
 #
 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 i386-symbian 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-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@ -1387,6 +1387,11 @@ ifndef TEST_OS_TARGET
 TEST_OS_TARGET:=$(word 5,$(TEST_FPC_COMPILERINFO))
 endif
 TEST_FULL_TARGET=$(TEST_CPU_TARGET)-$(TEST_OS_TARGET)
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+TEST_TARGETSUFFIX=$(TEST_OS_TARGET)
+else
+TEST_TARGETSUFFIX=$(TEST_FULL_TARGET)
+endif
 ifndef TEST_CCOMPILER
 ifeq ($(CPU_TARGET),$(TEST_CPU_TARGET))
 ifeq ($(OS_TARGET),$(TEST_OS_TARGET))
@ -1397,7 +1402,7 @@ endif
 endif
 endif
 endif
-TEST_OUTPUTDIR=output/$(TEST_FULL_TARGET)
+TEST_OUTPUTDIR=output/$(TEST_TARGETSUFFIX)
 TEST_DATETIME:=$(shell $(DATE) +%Y%m%d%H%M)
 ifndef TEST_USER
 TEST_USER=$(USER)
@ -1408,6 +1413,13 @@ endif
 DB_TARGZ=$(TEST_HOSTNAME)-$(TEST_DATETIME).tar.gz
 DB_HOST=fpc@www.freepascal.org
 DB_UPLOADDIR=/home/fpc/testsuite/incoming
+ifdef inWinNT
+inWinDOS=1
+endif
+ifeq ($(OS_SOURCE),go32v2)
+inWinDOS=1
+inDOS=1
+endif
 ifndef FAILLIST
 export FAILLIST:=$(TEST_OUTPUTDIR)/faillist
 endif
@ -1464,6 +1476,9 @@ endif
 ifneq ($(TEST_BINUTILSPREFIX),)
 override DOTESTOPT+=-Y-XP$(TEST_BINUTILSPREFIX) -Y-Xd
 endif
+ifdef inDOS
+override DOTESTOPT+=-X
+endif
 ifdef TEST_RSH
 override DOTESTOPT+=-R$(TEST_RSH)
 endif
@ -1541,9 +1556,9 @@ allexectest : testprep $(patsubst %.pp,%.elg,$(wildcard $(addsuffix /t*.pp,$(TES
 allexectests: allexectest allexectbs allexectbf allexecwebtbs allexecwebtbf
 .PHONY: clean distclean clean_test
 clean_test:
-	-$(DELTREE) output/$(TEST_FULL_TARGET)
+	-$(DELTREE) $(TEST_OUTPUTDIR)
 	-$(DEL) $(LOG) $(LONGLOG) $(FAILLIST)
-	-$(DEL) core gmon.out testprep-stamp.$(TEST_FULL_TARGET)
+	-$(DEL) core gmon.out testprep-stamp.$(TEST_FULL_TARGET) dotgz.bat
 clean:
 	$(MAKE) clean_test CPU_TARGET=$(TEST_CPU_TARGET) OS_TARGET=$(TEST_OS_TARGET)
 	$(MAKE) -C units clean CPU_TARGET=$(TEST_CPU_TARGET) OS_TARGET=$(TEST_OS_TARGET)
@ -1562,7 +1577,7 @@ $(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
+ifndef inWinDOS
 $(TEST_OUTPUTDIR)/tar.lst:
 	cd $(TEST_OUTPUTDIR) && find . -name '*.log' -o -name '*.elg' > tar.lst
 	$(ECHOREDIR) "log" >> $(TEST_OUTPUTDIR)/tar.lst
@ -1574,10 +1589,19 @@ endif
 	cd $(TEST_OUTPUTDIR) && tar cfz $(DB_TARGZ) --files-from=tar.lst
 else
 $(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/dbdigest.cfg
+ifdef inDOS
+	$(ECHOREDIR) @echo off > dotgz.bat
+	$(ECHOREDIR) cd $(subst /,\,$(TEST_OUTPUTDIR)) >> dotgz.bat
+	$(ECHOREDIR) $(subst /,\,../../$(PREPUP)) $(DB_TARGZ) >> dotgz.bat
+	$(ECHOREDIR) if errorlevel 1 $(DEL) $(DB_TARGZ) >> dotgz.bat
+	$(ECHOREDIR) cd $(subst /,\,../../) >> dotgz.bat
+	$(RUNBATCH) dotgz.bat
+else
 	cd "$(TEST_OUTPUTDIR)" && "../../$(PREPUP)" $(DB_TARGZ)
 endif
+endif
 uploadrun: $(TEST_OUTPUTDIR)/$(DB_TARGZ)
-ifdef inWinNT
+ifdef inWinDOS
 	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
--- a/tests/Makefile.fpc
+++ b/tests/Makefile.fpc
@ -61,6 +61,11 @@ ifndef TEST_OS_TARGET
 TEST_OS_TARGET:=$(word 5,$(TEST_FPC_COMPILERINFO))
 endif
 TEST_FULL_TARGET=$(TEST_CPU_TARGET)-$(TEST_OS_TARGET)
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+TEST_TARGETSUFFIX=$(TEST_OS_TARGET)
+else
+TEST_TARGETSUFFIX=$(TEST_FULL_TARGET)
+endif

 ifndef TEST_CCOMPILER
 ifeq ($(CPU_TARGET),$(TEST_CPU_TARGET))
@ -74,7 +79,7 @@ endif
 endif

 # Target dir where the ppu and binaries are created
-TEST_OUTPUTDIR=output/$(TEST_FULL_TARGET)
+TEST_OUTPUTDIR=output/$(TEST_TARGETSUFFIX)

 # Date and time the testsuite was run
 TEST_DATETIME:=$(shell $(DATE) +%Y%m%d%H%M)
@ -91,6 +96,14 @@ DB_TARGZ=$(TEST_HOSTNAME)-$(TEST_DATETIME).tar.gz
 DB_HOST=fpc@www.freepascal.org
 DB_UPLOADDIR=/home/fpc/testsuite/incoming

+ifdef inWinNT
+inWinDOS=1
+endif
+ifeq ($(OS_SOURCE),go32v2)
+inWinDOS=1
+inDOS=1
+endif
+
 ################################
 # Misc
 #
@ -192,6 +205,12 @@ endif
 ifneq ($(TEST_BINUTILSPREFIX),)
 override DOTESTOPT+=-Y-XP$(TEST_BINUTILSPREFIX) -Y-Xd
 endif
+# Don't use comspec for dos:
+# command.com returns 0 if it manages to execute a program
+# regardless of the program's exit code
+ifdef inDOS
+override DOTESTOPT+=-X
+endif
 ifdef TEST_RSH
 override DOTESTOPT+=-R$(TEST_RSH)
 endif
@ -312,9 +331,9 @@ allexectests: allexectest allexectbs allexectbf allexecwebtbs allexecwebtbf
 .PHONY: clean distclean clean_test

 clean_test:
-        -$(DELTREE) output/$(TEST_FULL_TARGET)
+        -$(DELTREE) $(TEST_OUTPUTDIR)
        -$(DEL) $(LOG) $(LONGLOG) $(FAILLIST)
-        -$(DEL) core gmon.out testprep-stamp.$(TEST_FULL_TARGET)
+        -$(DEL) core gmon.out testprep-stamp.$(TEST_FULL_TARGET) dotgz.bat

 clean:
        $(MAKE) clean_test CPU_TARGET=$(TEST_CPU_TARGET) OS_TARGET=$(TEST_OS_TARGET)
@ -346,7 +365,7 @@ $(TEST_OUTPUTDIR)/dbdigest.cfg:
        $(ECHOREDIR) Machine=$(TEST_HOSTNAME) >> $(TEST_OUTPUTDIR)/dbdigest.cfg
        $(ECHOREDIR) Comment=$(TEST_OPT) >> $(TEST_OUTPUTDIR)/dbdigest.cfg

-ifndef inWinNT
+ifndef inWinDOS
 $(TEST_OUTPUTDIR)/tar.lst:
        cd $(TEST_OUTPUTDIR) && find . -name '*.log' -o -name '*.elg' > tar.lst
        $(ECHOREDIR) "log" >> $(TEST_OUTPUTDIR)/tar.lst
@ -360,11 +379,20 @@ endif

 else
 $(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/dbdigest.cfg
+ifdef inDOS
+        $(ECHOREDIR) @echo off > dotgz.bat
+        $(ECHOREDIR) cd $(subst /,\,$(TEST_OUTPUTDIR)) >> dotgz.bat
+        $(ECHOREDIR) $(subst /,\,../../$(PREPUP)) $(DB_TARGZ) >> dotgz.bat
+        $(ECHOREDIR) if errorlevel 1 $(DEL) $(DB_TARGZ) >> dotgz.bat
+        $(ECHOREDIR) cd $(subst /,\,../../) >> dotgz.bat
+        $(RUNBATCH) dotgz.bat
+else
        cd "$(TEST_OUTPUTDIR)" && "../../$(PREPUP)" $(DB_TARGZ)
 endif
+endif

 uploadrun: $(TEST_OUTPUTDIR)/$(DB_TARGZ)
-ifdef inWinNT
+ifdef inWinDOS
        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
--- a/tests/units/Makefile
+++ b/tests/units/Makefile
@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/04/26]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/04/18]
 #
 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 i386-embedded i386-symbian 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-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@ -424,175 +424,175 @@ override CLEAN_UNITS+=erroru popuperr ptest
 endif
 override INSTALL_FPCPACKAGE=y
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_TARGETDIR+=$(FULL_TARGET)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
--- a/tests/units/Makefile.fpc
+++ b/tests/units/Makefile.fpc
@ -11,7 +11,7 @@ fpcpackage=y
 units = erroru popuperr ptest

 [compiler]
-targetdir=$(FULL_TARGET)
+targetdir=$(TARGETSUFFIX)

 [default]
 fpcdir=../..