From 7869db56cc1dfe4a96c995f122375028a821a6fb Mon Sep 17 00:00:00 2001
From: yury <jura@cp-lab.com>
Date: Sat, 19 Apr 2008 23:21:24 +0000
Subject: [PATCH] * Fixed tests to compile for wince.
git-svn-id: trunk@10733 -
---
tests/webtbs/tw6822b.pp | 4 ++--
tests/webtbs/tw7838a.pp | 10 +---------
tests/webtbs/tw7838b.pp | 4 ++--
tests/webtbs/uw7838a.pp | 2 +-
4 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/tests/webtbs/tw6822b.pp b/tests/webtbs/tw6822b.pp
index d038005749..24e9323eb0 100644
--- a/tests/webtbs/tw6822b.pp
+++ b/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');
diff --git a/tests/webtbs/tw7838a.pp b/tests/webtbs/tw7838a.pp
index 2a810cfa85..2249d919a9 100644
--- a/tests/webtbs/tw7838a.pp
+++ b/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
diff --git a/tests/webtbs/tw7838b.pp b/tests/webtbs/tw7838b.pp
index 60305ba9b7..77ebbd31c3 100644
--- a/tests/webtbs/tw7838b.pp
+++ b/tests/webtbs/tw7838b.pp
@@ -24,8 +24,8 @@ const
libname = './libtw7838a.so';
{$endif}
{$endif}
-{$ifdef mswindows}
- libname = '.\tw7838a.dll';
+{$ifdef windows}
+ libname = 'tw7838a.dll';
{$endif}
var
diff --git a/tests/webtbs/uw7838a.pp b/tests/webtbs/uw7838a.pp
index 55f3a43648..726c0a0847 100644
--- a/tests/webtbs/uw7838a.pp
+++ b/tests/webtbs/uw7838a.pp
@@ -6,7 +6,7 @@ interface
var
aa: longint;
-{$ifdef mswindows}
+{$ifdef windows}
function exetest: longint; external 'tw7838b.exe';
{$endif}