From 650f9e9b34e81ef30f5fe21aca13cad3710d820a Mon Sep 17 00:00:00 2001
From: inoussa <inoussa@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sun, 21 Sep 2008 16:56:14 +0000
Subject: [PATCH] POOLED_Release_NON and Release_NON are enabled on win32/64
 due to non-existence of timeout for semaphore

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@566 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 wst/trunk/tests/test_suite/test_utilities.pas     | 8 ++++++++
 wst/trunk/tests/test_suite/wst_test_suite.lpr     | 4 ++--
 wst/trunk/tests/test_suite/wst_test_suite_gui.lpr | 4 ++--
 wst/trunk/wst_global.inc                          | 5 +++++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/wst/trunk/tests/test_suite/test_utilities.pas b/wst/trunk/tests/test_suite/test_utilities.pas
index abeace286..41a7a2d94 100644
--- a/wst/trunk/tests/test_suite/test_utilities.pas
+++ b/wst/trunk/tests/test_suite/test_utilities.pas
@@ -82,7 +82,9 @@ type
     procedure Create_ZEROS();
     procedure Create_NON_ZERO_MIN();
     procedure Release();
+{$IFDEF WST_SEMAPHORE_TIMEOUT}
     procedure Release_NON();
+{$ENDIF WST_SEMAPHORE_TIMEOUT}
     procedure Discard();
   end;
   
@@ -93,7 +95,9 @@ type
     procedure NOT_Pooled();
     procedure POOLED_Create_ZEROS();
     procedure POOLED_Release();
+{$IFDEF WST_SEMAPHORE_TIMEOUT}
     procedure POOLED_Release_NON();
+{$ENDIF WST_SEMAPHORE_TIMEOUT}
     procedure POOLED_Discard();
   end;
 
@@ -205,6 +209,7 @@ begin
   end;
 end;
 
+{$IFDEF WST_SEMAPHORE_TIMEOUT}
 procedure TTest_TIntfPool.Release_NON();
 const MIN_A = Integer(1); MAX_A = Integer(5); MIN_B = Integer(0);
 var
@@ -242,6 +247,7 @@ begin
     obj.Release(elt);
   end;
 end;
+{$ENDIF WST_SEMAPHORE_TIMEOUT}
 
 procedure TTest_TIntfPool.Discard();
 const MIN_A = Integer(1); MAX_A = Integer(5); MIN_B = Integer(0);
@@ -358,6 +364,7 @@ begin
   end;
 end;
 
+{$IFDEF WST_SEMAPHORE_TIMEOUT}
 procedure TTest_TSimpleItemFactoryEx.POOLED_Release_NON();
 const MIN_A = Integer(1); MAX_A = Integer(5); MIN_B = Integer(0);
 var
@@ -394,6 +401,7 @@ begin
     obj.ReleaseInstance(elt);
   end;
 end;
+{$ENDIF WST_SEMAPHORE_TIMEOUT}
 
 procedure TTest_TSimpleItemFactoryEx.POOLED_Discard();
 const MIN_A = Integer(1); MAX_A = Integer(5); MIN_B = Integer(0);
diff --git a/wst/trunk/tests/test_suite/wst_test_suite.lpr b/wst/trunk/tests/test_suite/wst_test_suite.lpr
index 4660e0e06..25a1bf87a 100644
--- a/wst/trunk/tests/test_suite/wst_test_suite.lpr
+++ b/wst/trunk/tests/test_suite/wst_test_suite.lpr
@@ -4,9 +4,9 @@ program wst_test_suite;
 {$DEFINE UseCThreads}
 
 uses
-  {$IFDEF UNIX}{$IFDEF UseCThreads}
+  {$IFDEF UNIX}
   cthreads,
-  {$ENDIF}{$ENDIF}
+  {$ENDIF}
 
   custapp, classes, sysutils, fpcunit, testreport, testregistry, 
   TestFormatter_unit, testmetadata_unit,
diff --git a/wst/trunk/tests/test_suite/wst_test_suite_gui.lpr b/wst/trunk/tests/test_suite/wst_test_suite_gui.lpr
index d27719a42..aaa17da5f 100644
--- a/wst/trunk/tests/test_suite/wst_test_suite_gui.lpr
+++ b/wst/trunk/tests/test_suite/wst_test_suite_gui.lpr
@@ -3,9 +3,9 @@ program wst_test_suite_gui;
 {$mode objfpc}{$H+}
 
 uses
-  {$IFDEF UNIX}{$IFDEF UseCThreads}
+  {$IFDEF UNIX}
   cthreads,
-  {$ENDIF}{$ENDIF}
+  {$ENDIF}
   Interfaces, Forms, GuiTestRunner,
   TestFormatter_unit, testmetadata_unit,
   server_service_soap, soap_formatter, base_binary_formatter,
diff --git a/wst/trunk/wst_global.inc b/wst/trunk/wst_global.inc
index 36e5c6c32..6ca3b6bef 100644
--- a/wst/trunk/wst_global.inc
+++ b/wst/trunk/wst_global.inc
@@ -2,6 +2,7 @@
 {$UNDEF TRemotableTypeInitializer_Initialize}
 {$UNDEF WST_TKPROCVAR}
 {$UNDEF WST_UNICODESTRING}
+{$UNDEF WST_SEMAPHORE_TIMEOUT}
 
 {$WARNINGS OFF}
 
@@ -25,6 +26,9 @@
     {$IF Defined(FPC_211)}
       {$DEFINE HAS_FORMAT_SETTINGS}                                              
     {$IFEND}
+    {$IFDEF WINDOWS}
+      {$DEFINE WST_SEMAPHORE_TIMEOUT}
+    {$ENDIF WINDOWS}
   {$ENDIF}
 
   {$IFNDEF FPC}
@@ -38,6 +42,7 @@
     {$IFDEF VER150}
       {$DEFINE HAS_FORMAT_SETTINGS}
     {$ENDIF}
+    {$DEFINE WST_SEMAPHORE_TIMEOUT}
   {$ENDIF}
 
   {$IFDEF CPU86}