Browse Source

* Restrict all tests to win32 and win64 targets
* Rename executables so the DLL are generated before.

git-svn-id: trunk@17788 -

pierre 14 years ago
parent
commit
c4d43cfd59

+ 2 - 2
.gitattributes

@@ -9635,14 +9635,14 @@ tests/test/cg/variants/tvarol96.pp svneol=native#text/plain
 tests/test/dumpclass.pp svneol=native#text/plain
 tests/test/dumpmethods.pp svneol=native#text/plain
 tests/test/lcpref.inc svneol=native#text/plain
-tests/test/library/tdllexe.pp svneol=native#text/plain
-tests/test/library/tdlltest.pp svneol=native#text/plain
 tests/test/library/testdll.pp svneol=native#text/plain
 tests/test/library/testdll2.pp svneol=native#text/plain
 tests/test/library/tlib1a.pp svneol=native#text/plain
 tests/test/library/tlib1a2.pp svneol=native#text/plain
 tests/test/library/tlib1b.pp svneol=native#text/plain
 tests/test/library/tlib2b.pp svneol=native#text/plain
+tests/test/library/ttdllexe.pp svneol=native#text/plain
+tests/test/library/ttdlltest.pp svneol=native#text/plain
 tests/test/library/ulib2a.pp svneol=native#text/plain
 tests/test/library/ulib2b.pp svneol=native#text/plain
 tests/test/opt/README.txt svneol=native#text/plain

+ 1 - 0
tests/test/library/testdll.pp

@@ -1,5 +1,6 @@
 { %target=win32,win64 }
 { %needlibrary }
+{ %neededafter }
 {
   Copyright (c) 1998 by Pierre Muller
 

+ 1 - 0
tests/test/library/testdll2.pp

@@ -1,5 +1,6 @@
 { %target=win32,win64 }
 { %needlibrary }
+{ %neededafter }
 {
   Copyright (c) 1998 by Pierre Muller
 

+ 2 - 2
tests/test/library/tlib1a.pp

@@ -1,6 +1,6 @@
-{ %skiptarget=go32v2 }
+{ %target=win32,win64 }
 { %norun }
-{$goto on}
+{ %neededafter }
 library tlib1a;
 
   procedure p(var a : dword);

+ 2 - 2
tests/test/library/tlib1a2.pp

@@ -1,6 +1,6 @@
-{ %skiptarget=go32v2 }
+{ %target=win32,win64 }
 { %norun }
-{$goto on}
+{ %neededafter }
 library tlib1a2;
 
   procedure p(var a : dword);

+ 1 - 1
tests/test/library/tlib1b.pp

@@ -1,4 +1,4 @@
-{ %target=win32,win64,wince }
+{ %target=win32,win64 }
 { %needlibrary }
 
 { Checks that the two functions with the same exported name 'p'

+ 2 - 1
tests/test/library/tlib2b.pp

@@ -1,6 +1,7 @@
-{ %target=win32,win64,wince }
+{ %target=win32,win64 }
 { %needlibrary }
 
+
 uses
   ulib2a, ulib2b;
 { Checks that the two functions with the same exported name 'p'

+ 11 - 3
tests/test/library/tdllexe.pp → tests/test/library/ttdllexe.pp

@@ -1,9 +1,17 @@
+{ %target=win32,win64 }
+{ %needlibrary }
 {
-  Copyright (c) 1998 by Pierre Muller
 
-  Win32 DLL usage example. It needs testdll.pp
+  Win32 DLL usage example. It needs testdll2.pp
+  This test checksq the windows abality to
+  export a function in an executable.
+
+  Here procedure TestExeProc is exported
+  and is imported by testdll2 DLL.
+
 }
-program tdllexe;
+
+program ttdllexe;
 
 uses
   Windows;

+ 9 - 3
tests/test/library/tdlltest.pp → tests/test/library/ttdlltest.pp

@@ -1,9 +1,15 @@
+{ %target=win32,win64 }
+{ %needlibrary }
 {
-  Copyright (c) 1998 by Pierre Muller
 
-  Win32 DLL usage example. It needs testdll.pp
+  Win32 DLL usage example. It needs testdll.pp DLL
+
+  The use of threads creates RTE problems with compilers
+  up to 2.4.4 release at least.
+
 }
-program tdlltest;
+
+program ttdlltest;
 
 uses
   Windows;

+ 1 - 1
tests/test/library/ulib2a.pp

@@ -1,4 +1,4 @@
-{ %target=win32,win64,wince }
+{ %target=win32,win64 }
 { %needlibrary }
 
 unit

+ 1 - 1
tests/test/library/ulib2b.pp

@@ -1,4 +1,4 @@
-{ %target=win32,win64,wince }
+{ %target=win32,win64 }
 { %needlibrary }
 
 unit