Merged revisions 10733,10735-10739,10748 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
  r10733 | yury | 2008-04-20 02:21:24 +0300 (Вс, 20 апр 2008) | 1 line
  
  * Fixed tests to compile for wince.
........
  r10748 | yury | 2008-04-21 15:33:12 +0300 (Пн, 21 апр 2008) | 1 line
  
  * This test is not for wince.
........

git-svn-id: branches/fixes_2_2@10751 -

tests/webtbs/tw6822b.pp

@@ -16,9 +16,9 @@ libname = './libtw6822a.so';
 {$endif darwin}
 {$endif unix}
 
-{$ifdef mswindows}
+{$ifdef windows}
 libname = 'tw6822a.dll';
-{$endif mswindows}
+{$endif windows}
 
 begin
   writeln('hello from loader program');

tests/webtbs/tw7838a.pp

@@ -7,15 +7,7 @@ library tw7838a;
 
 uses uw7838a;
 
-{$ifdef win32}
-const
- progname = '.\prog.exe';
-{$endif}
-
-
-
-
-function dllf: longint; 
+function dllf: longint;
 begin
   result:=exetest;
   if (result<>aa) then

tests/webtbs/tw7838b.pp

@@ -1,4 +1,4 @@
-{ %target=win32,win64,wince,linux}
+{ %target=win32,win64,linux}
 
 program prog;
 {$mode objfpc}
@@ -24,8 +24,8 @@ const
   libname = './libtw7838a.so';
 {$endif}
 {$endif}
-{$ifdef mswindows}
-  libname = '.\tw7838a.dll';
+{$ifdef windows}
+  libname = 'tw7838a.dll';
 {$endif}
 
 var

tests/webtbs/uw7838a.pp

@@ -6,7 +6,7 @@ interface
 var
   aa: longint;
 
-{$ifdef mswindows}
+{$ifdef windows}
 function exetest: longint; external 'tw7838b.exe'; 
 {$endif}