From 681350daba17ccc328050c98279c616974eba312 Mon Sep 17 00:00:00 2001 From: nickysn Date: Sun, 10 Nov 2013 12:23:26 +0000 Subject: [PATCH] * add the options specified in TEST_OPT when compiling the tstunits. This allows running the testsuite for a different than the default i8086 memory model by specifying (for example) TEST_OPT=-WmMedium git-svn-id: trunk@26007 - --- tests/tstunits/Makefile | 4 ++-- tests/tstunits/Makefile.fpc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/tstunits/Makefile b/tests/tstunits/Makefile index f247c59f2d..c23d1937ff 100644 --- a/tests/tstunits/Makefile +++ b/tests/tstunits/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/10/05] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/11/10] # 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 @@ -1758,7 +1758,7 @@ endif ifeq ($(OS_TARGET),msdos) override OPT=-CX endif -TESTOPT:=-n -FE$(COMPILER_TARGETDIR) -T$(OS_TARGET) $(OPT) +TESTOPT:=-n $(TEST_OPT) -FE$(COMPILER_TARGETDIR) -T$(OS_TARGET) $(OPT) ifeq ($(CPU_TARGET),armeb) override TESTOPT+=-Cb endif diff --git a/tests/tstunits/Makefile.fpc b/tests/tstunits/Makefile.fpc index 5a6b6503b3..a18de5e092 100644 --- a/tests/tstunits/Makefile.fpc +++ b/tests/tstunits/Makefile.fpc @@ -27,7 +27,7 @@ ifeq ($(OS_TARGET),msdos) override OPT=-CX endif -TESTOPT:=-n -FE$(COMPILER_TARGETDIR) -T$(OS_TARGET) $(OPT) +TESTOPT:=-n $(TEST_OPT) -FE$(COMPILER_TARGETDIR) -T$(OS_TARGET) $(OPT) ifeq ($(CPU_TARGET),armeb) override TESTOPT+=-Cb endif