Browse Source

* for the time being, skip units which do not build on i8086-msdos

git-svn-id: branches/i8086@24096 -
florian 12 years ago
parent
commit
259e9757a7
2 changed files with 9 additions and 1 deletions
  1. 5 1
      tests/tstunits/Makefile
  2. 4 0
      tests/tstunits/Makefile.fpc

+ 5 - 1
tests/tstunits/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/03/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/03/19]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim i386-android 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 powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd 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 arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android i8086-msdos
@@ -1766,8 +1766,10 @@ DUMMYINSTALLDIR=$(BASEDIR)/tmp
 INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
 FPCUNITDIR=../../packages/fcl-fpcunit/src
 fpcunit-stamp.$(FULL_TARGET):
+ifneq ($(OS_TARGET),msdos)
 	$(TESTCOMPILER) -Fu$(BASEDIR)/$(COMPILER_TARGETDIR) $(FPCUNITDIR)/testutils
 	$(TESTCOMPILER) -Fu$(BASEDIR)/$(COMPILER_TARGETDIR) $(FPCUNITDIR)/fpcunit
+endif
 	$(ECHO) Compiled > fpcunit-stamp.$(FULL_TARGET)
 cleanfpcunit:
 	$(DELTREE) $(COMPILER_TARGETDIR)
@@ -1800,7 +1802,9 @@ TESTCOMPILER=$(FPC) $(TESTOPT)
 erroru$(PPUEXT) : erroru.pp
 	$(TESTCOMPILER) erroru.pp
 ptest$(PPUEXT) : ../test/cg/ptest.pp
+ifneq ($(OS_TARGET),msdos)
 	$(TESTCOMPILER) ../test/cg/ptest.pp
+endif
 popuperr$(PPUEXT) : popuperr.pp
 	$(TESTCOMPILER) popuperr.pp
 ifdef CCOMPILER

+ 4 - 0
tests/tstunits/Makefile.fpc

@@ -59,8 +59,10 @@ INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPIL
 FPCUNITDIR=../../packages/fcl-fpcunit/src
 
 fpcunit-stamp.$(FULL_TARGET):
+ifneq ($(OS_TARGET),msdos)
  	$(TESTCOMPILER) -Fu$(BASEDIR)/$(COMPILER_TARGETDIR) $(FPCUNITDIR)/testutils
         $(TESTCOMPILER) -Fu$(BASEDIR)/$(COMPILER_TARGETDIR) $(FPCUNITDIR)/fpcunit
+endif
         $(ECHO) Compiled > fpcunit-stamp.$(FULL_TARGET)
 
 cleanfpcunit:
@@ -115,7 +117,9 @@ erroru$(PPUEXT) : erroru.pp
         $(TESTCOMPILER) erroru.pp
 
 ptest$(PPUEXT) : ../test/cg/ptest.pp
+ifneq ($(OS_TARGET),msdos)
         $(TESTCOMPILER) ../test/cg/ptest.pp
+endif
 
 popuperr$(PPUEXT) : popuperr.pp
         $(TESTCOMPILER) popuperr.pp