Browse Source

* fixed some test/opt tests
+ include test/opt directory in Makefile

git-svn-id: trunk@8198 -

Jonas Maebe 18 years ago
parent
commit
dcb69b44b9
6 changed files with 15 additions and 13 deletions
  1. 0 1
      .gitattributes
  2. 3 3
      tests/Makefile
  3. 1 1
      tests/Makefile.fpc
  4. 1 1
      tests/test/opt/tgotoreg.pp
  5. 0 7
      tests/test/opt/treg2.dat
  6. 10 0
      tests/test/opt/treg2.pp

+ 0 - 1
.gitattributes

@@ -6779,7 +6779,6 @@ tests/test/opt/tcse2.pp svneol=native#text/plain
 tests/test/opt/tcse3.pp svneol=native#text/plain
 tests/test/opt/tgotoreg.pp svneol=native#text/plain
 tests/test/opt/treg1.pp svneol=native#text/plain
-tests/test/opt/treg2.dat -text
 tests/test/opt/treg2.pp svneol=native#text/plain
 tests/test/opt/treg3.pp svneol=native#text/plain
 tests/test/opt/treg4.pp svneol=native#text/plain

+ 3 - 3
tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/03/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/07/29]
 #
 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
@@ -992,7 +992,7 @@ override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
 endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
-override FPCOPT+=-XP$(BINUTILSPREFIX) -Xc
+override FPCOPT+=-XP$(BINUTILSPREFIX) 
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
@@ -1392,7 +1392,7 @@ endif
 ifndef LOG
 export LOG:=$(TEST_OUTPUTDIR)/log
 endif
-TESTSUBDIRS=cg cg/variants cg/cdecl units/system units/dos units/crt units/objects units/strings units/sysutils units/math units/sharemem
+TESTSUBDIRS=cg cg/variants cg/cdecl opt units/system units/dos units/crt units/objects units/strings units/sysutils units/math units/sharemem
 TESTDIRS:=test $(addprefix test/,$(TESTSUBDIRS))
 .PHONY: utils units copyfiles testprep
 utils:

+ 1 - 1
tests/Makefile.fpc

@@ -109,7 +109,7 @@ endif
 
 
 # Subdirs available in the test subdir
-TESTSUBDIRS=cg cg/variants cg/cdecl units/system units/dos units/crt units/objects units/strings units/sysutils units/math units/sharemem
+TESTSUBDIRS=cg cg/variants cg/cdecl opt units/system units/dos units/crt units/objects units/strings units/sysutils units/math units/sharemem
 
 # All full dirnames in the test/ dir including the subdir self
 TESTDIRS:=test $(addprefix test/,$(TESTSUBDIRS))

+ 1 - 1
tests/test/opt/tgotoreg.pp

@@ -1,4 +1,4 @@
-{% OPT=-Or}
+{ %OPT=-Ooregvar }
 
 {$goto on}
 

+ 0 - 7
tests/test/opt/treg2.dat

@@ -1,7 +0,0 @@
-1.0
-2.0
-3.0
-4.0
-5.0
-6.0
-

+ 10 - 0
tests/test/opt/treg2.pp

@@ -36,7 +36,17 @@ procedure p;
 
 begin
    assign(t,'treg2.dat');
+   rewrite(t);
+   writeln(t,'1.0');
+   writeln(t,'2.0');
+   writeln(t,'3.0');
+   writeln(t,'4.0');
+   writeln(t,'5.0');
+   writeln(t,'6.0');
+   close(t);
    reset(t);
    p;
    close(t);
+   erase(t);
 end.
+