From d37aa8ac098394c9cd91c0b5f4a499d320306258 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Sun, 15 Sep 2013 12:50:03 +0000
Subject: [PATCH] test: fixed compiling runtests, fixes TestExpandFilename
 under Windows

git-svn-id: trunk@42805 -
---
 test/lazutils/testlazutils.pas    | 7 +++++++
 test/lcltests/testpagecontrol.pas | 4 ++--
 test/testunits.pas                | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/test/lazutils/testlazutils.pas b/test/lazutils/testlazutils.pas
index aac791b9f2..5f395047e6 100644
--- a/test/lazutils/testlazutils.pas
+++ b/test/lazutils/testlazutils.pas
@@ -106,9 +106,16 @@ end;
 
 procedure TTestLazUtils.TestExpandFilename;
 begin
+  {$IFDEF Unix}
   AssertEquals('basedir','/opt/ide',ExpandFileNameUTF8('ide','/opt/'));
   AssertEquals('basedir','/opt/ide',ExpandFileNameUTF8('ide','/opt'));
   AssertEquals('basedir','/ide',ExpandFileNameUTF8('/ide','/opt'));
+  {$ENDIF}
+  {$IFDEF Windows}
+  AssertEquals('basedir','C:\opt\ide',ExpandFileNameUTF8('ide','C:\opt\'));
+  AssertEquals('basedir','D:\opt\ide',ExpandFileNameUTF8('ide','D:\opt'));
+  AssertEquals('basedir','E:\ide',ExpandFileNameUTF8('E:\ide','D:\opt'));
+  {$ENDIF}
 end;
 
 procedure TTestLazUtils.TestMergeCmdLineParams;
diff --git a/test/lcltests/testpagecontrol.pas b/test/lcltests/testpagecontrol.pas
index e3922fdb92..9eb8cf0479 100644
--- a/test/lcltests/testpagecontrol.pas
+++ b/test/lcltests/testpagecontrol.pas
@@ -6,8 +6,8 @@ interface
 
 uses
   Classes, SysUtils, types, math, fpcunit, Interfaces, LCLType, LCLIntf, Forms, ComCtrls,
-  Controls, StdCtrls, LMessages, LCLProc, WSComCtrls, testglobals, MouseInputIntf,
-  MouseAndKeyInput;
+  Controls, StdCtrls, LMessages, LCLProc, WSComCtrls, testglobals,
+  MouseInputIntf, MouseAndKeyInput;
 
 type
 
diff --git a/test/testunits.pas b/test/testunits.pas
index 7fb7b76751..4d507b5896 100644
--- a/test/testunits.pas
+++ b/test/testunits.pas
@@ -35,10 +35,10 @@ uses
   TestBasicCodetools, TestCTXMLFixFragments, TestCTRangeScan, TestCTH2Pas,
   TestCompleteBlock, TestStdCodetools, TestMethodJumpTool, TestCfgScript,
   // lcltests
-  testunicode, testpen, TestPreferredSize, TestTextStrings, testpagecontrol
+  testunicode, testpen, TestPreferredSize, TestTextStrings
   {$IFNDEF NoSemiAutomatedTests}
   // semi-automatic tests
-  , semiautotest, idesemiautotests, lclsemiautotests
+  , testpagecontrol, semiautotest, idesemiautotests, lclsemiautotests
   {$endif}
   ;