From 82cda34b489244e536dc6f713e74ed770a8506fd Mon Sep 17 00:00:00 2001
From: Martin <laz.git@mfriebe.de>
Date: Tue, 19 Mar 2024 22:15:01 +0100
Subject: [PATCH] FpDebug, test: update for 3.3.1

---
 .../lazdebuggers/lazdebugtestbase/sources.res | Bin 116532 -> 116864 bytes
 .../testapps/WatchesValuePrg.pas              |   2 +-
 .../testapps/WatchesValuePrgIdent.inc         |  32 +++++++++---------
 .../lazdebugtestbase/ttestwatchutilities.pas  |   2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/components/lazdebuggers/lazdebugtestbase/sources.res b/components/lazdebuggers/lazdebugtestbase/sources.res
index 6941ba66cf8cc0d06c8c7e03a2d72de107ce42e8..f1a9dd016f64ec76ef44f2cd761847b0be46c7fe 100644
GIT binary patch
delta 583
zcmdne$KEiJeS?DvE9V6U2A9c+UsN||sXX!Yt5)%J%X4vcQ}FYT4~YzLtu3i6NUc_J
z^>gubt5s0aQP8lp*4NijP>T0Ainmp;RluuZvSGi*=1F;{T3Hwv=3U+#_vMhG5Ksru
zd`~}DxE0eMsxyjCpP>aL9;h+ePw!M?yv<*&66%NKj_J9YjFQu<)fxW?Vi+*JOoQ<!
zx`ypQ4dRTLinljwF}gFNs|Fjt{h>DFZANSkY}AK2uuc!?z%~O$i|Mg?jLWeaGhJGr
z@t+8WD{FbVroVGx6bE~BySo9S5)M~17&0DZ#pa3tV@A>KQRa*xOz8G*Ut`H=q=rq;
zhkQo8?K}yL2l&zTOb6;w+YXesa>NX!>6#lEFMxzmBB6Hr`;ClZ(}8+qwrg)<<P-$}
DGrF@%

delta 248
zcmZpe$iAhIeS?Dv>-F;t3@(!!r9?MJseJL2DXA<-RZ!AV(6F`E*Vj={iuX5)w^guJ
z0EthIZ_=2|-^RB2RNj$R*0xIw3;|$`tG=u<Wa8zTe$a+dczd-Pqdw#I-Rg|OjME=z
zF#g#7Qj<}XaeAUIqsVp@ZAK%;?ddv<pBSe*8Ze4(Z_r~jX54;6AEe@}5u@aG7DGmJ
z#_c{vjCWY4FEjzF@V8(LVVeH6fKg@p4J$?-H5Ohj1%>Gs%^8KK8x%5%Pk*1m$gy1~
sk#PtAcA%m-$LXn?7|%~XW5p;p{r3Sz&gu8e8QDN8S+|#OX5<tF0F@9?A^-pY

diff --git a/components/lazdebuggers/lazdebugtestbase/testapps/WatchesValuePrg.pas b/components/lazdebuggers/lazdebugtestbase/testapps/WatchesValuePrg.pas
index cee5e2e27a..6e151219da 100644
--- a/components/lazdebuggers/lazdebugtestbase/testapps/WatchesValuePrg.pas
+++ b/components/lazdebuggers/lazdebugtestbase/testapps/WatchesValuePrg.pas
@@ -436,7 +436,7 @@ type
 
 
   // type TxByte: type Byte;
-  TEST_PREPOCESS(WatchesValuePrgIdent.inc, pre__=Tx, "_OP_== type ", (=;//, "_O2_= = type", _EQ_=, _BLOCK_=TestVar, _BLOCK2_=TestType )
+  TEST_PREPOCESS(WatchesValuePrgIdent.inc, pre__=Tx, "_OP_== {$IFnDEF NO_TYPE}type{$ENDIF} ", (=;//, "_O2_= = {$IFnDEF NO_TYPE}type{$ENDIF}", _EQ_=, _BLOCK_=TestVar, _BLOCK2_=TestType )
   // type PTxByte: ^TxByte;
   TEST_PREPOCESS(WatchesValuePrgIdent.inc,pre__=PTx, _OP_={, _O2_={, _pre3_=^Tx, "//@@=} = ", _BLOCK_=TestVar, _BLOCK2_=TestType ) //}
 
diff --git a/components/lazdebuggers/lazdebugtestbase/testapps/WatchesValuePrgIdent.inc b/components/lazdebuggers/lazdebugtestbase/testapps/WatchesValuePrgIdent.inc
index b95106fae7..676ff982a7 100644
--- a/components/lazdebuggers/lazdebugtestbase/testapps/WatchesValuePrgIdent.inc
+++ b/components/lazdebuggers/lazdebugtestbase/testapps/WatchesValuePrgIdent.inc
@@ -162,24 +162,24 @@
   // **** ARRAY ****
   // **** Dyn ARRAY ****
 
-  {$IFnDEF TestPointer}
+  {$IFnDEF TestPointer} {$DEFINE NO_TYPE}
   pre__CharDynArray{e}    _O2_ array of char          _EQ_      (nil);          //@@ _pre3_CharDynArray{e3};  // open array if used as function arg;
   pre__CharDynArray2{e}   _O2_ array of char          _EQ_      (nil);          //@@ _pre3_CharDynArray2{e3}; // len = 3 // open array if used as function arg;
-  {$ENDIF} // TestPointer
+  {$ENDIF} {$UNDEF NO_TYPE} // TestPointer
   pre__CharDynArray3{e}   _O2_ TCharDynArray          _EQ_      (nil);          //@@ _pre3_CharDynArray3{e3};
   pre__CharDynArray4{e}   _O2_ TCharDynArray          _EQ_      (nil);          //@@ _pre3_CharDynArray4{e3}; // len = 3;
 
-  {$IFnDEF TestPointer}
+  {$IFnDEF TestPointer} {$DEFINE NO_TYPE}
   pre__WCharDynArray{e}   _O2_ array of widechar      _EQ_      (nil);          //@@ _pre3_WCharDynArray{e3};
   pre__WCharDynArray2{e}  _O2_ array of widechar      _EQ_      (nil);          //@@ _pre3_WCharDynArray2{e3}; // len = 3;
-  {$ENDIF} // TestPointer
+  {$ENDIF} {$UNDEF NO_TYPE} // TestPointer
   pre__WCharDynArray3{e}  _O2_ TWCharDynArray         _EQ_      (nil);          //@@ _pre3_WCharDynArray3{e3};
   pre__WCharDynArray4{e}  _O2_ TWCharDynArray         _EQ_      (nil);          //@@ _pre3_WCharDynArray4{e3}; // len = 3;
 
-  {$IFnDEF TestPointer}
+  {$IFnDEF TestPointer} {$DEFINE NO_TYPE}
   pre__IntDynArray{e}    _O2_ array of Integer        _EQ_      (nil);          //@@ _pre3_IntDynArray{e3};    // open array if used as function arg;
   pre__IntDynArray2{e}   _O2_ array of Integer        _EQ_      (nil);          //@@ _pre3_IntDynArray2{e3};   // len = 3 // open array if used as function arg;
-  {$ENDIF} // TestPointer
+  {$ENDIF} {$UNDEF NO_TYPE} // TestPointer
   pre__IntDynArray3{e}   _O2_ TIntDynArray            _EQ_      (nil);          //@@ _pre3_IntDynArray3{e3};
   pre__IntDynArray4{e}   _O2_ TIntDynArray            _EQ_      (nil);          //@@ _pre3_IntDynArray4{e3};   // len = 3;
 
@@ -187,17 +187,17 @@
 
   pre__IntDynArray4_Int{e} _O2_ PtrUInt _EQ_ (0);    //@@ _pre3_IntDynArray4_Int{e3};
 
-  {$IFnDEF TestPointer}
+  {$IFnDEF TestPointer} {$DEFINE NO_TYPE}
   pre__AnsiDynArray{e}    _O2_ array of AnsiString    _EQ_      (nil);          //@@ _pre3_AnsiDynArray{e3};    // open array if used as function arg;
   pre__AnsiDynArray2{e}   _O2_ array of AnsiString    _EQ_      (nil);          //@@ _pre3_AnsiDynArray2{e3};   // len = 3 // open array if used as function arg;
-  {$ENDIF} // TestPointer
+  {$ENDIF} {$UNDEF NO_TYPE} // TestPointer
   pre__AnsiDynArray3{e}   _O2_ TAnsiDynArray          _EQ_      (nil);          //@@ _pre3_AnsiDynArray3{e3};
   pre__AnsiDynArray4{e}   _O2_ TAnsiDynArray          _EQ_      (nil);          //@@ _pre3_AnsiDynArray4{e3};   // len = 3;
 
-  {$IFnDEF TestPointer}
+  {$IFnDEF TestPointer} {$DEFINE NO_TYPE}
   pre__ShortStrDynArray{e}    _O2_ array of ShortStr10 _EQ_      (nil);         //@@ _pre3_ShortStrDynArray{e3};    // open array if used as function arg;
   pre__ShortStrDynArray2{e}   _O2_ array of ShortStr10 _EQ_      (nil);         //@@ _pre3_ShortStrDynArray2{e3};   // len = 3 // open array if used as function arg;
-  {$ENDIF} // TestPointer
+  {$ENDIF} {$UNDEF NO_TYPE} // TestPointer
   pre__ShortStrDynArray3{e}   _O2_ TShortStrDynArray   _EQ_      (nil);         //@@ _pre3_ShortStrDynArray3{e3};
   pre__ShortStrDynArray4{e}   _O2_ TShortStrDynArray   _EQ_      (nil);         //@@ _pre3_ShortStrDynArray4{e3};   // len = 3;
 
@@ -215,12 +215,12 @@
 {$IFnDEF TestAssignGC}
 {$IFnDEF TestParam}
 {$IFnDEF TestArg}
-  {$IFnDEF TestPointer}
+  {$IFnDEF TestPointer} {$DEFINE NO_TYPE}
   pre__FiveDynArray2{e}            _O2_        array of          record a:longint; b: byte end _EQ_ (nil);          //@@ _pre3_FiveDynArray2{e3};
   pre__FiveDynArrayPack2{e}        _O2_ packed array of          record a:longint; b: byte end _EQ_ (nil);          //@@ _pre3_FiveDynArrayPack2{e3};
   pre__FivePackDynArray2{e}        _O2_        array of   packed record a:longint; b: byte end _EQ_ (nil);          //@@ _pre3_FivePackDynArray2{e3};
   pre__FivePackDynArrayPack2{e}    _O2_ packed array of   packed record a:longint; b: byte end _EQ_ (nil);          //@@ _pre3_FivePackDynArrayPack2{e3};
-  {$ENDIF} // TestPointer
+  {$ENDIF} {$UNDEF NO_TYPE} // TestPointer
 {$ENDIF}
 {$ENDIF}
 {$ENDIF}
@@ -317,7 +317,7 @@
   // **** Static ARRAY ****
 {$IFnDEF TestParam}
 {$IFnDEF TestArg}
-{$IFnDEF TestPointer}
+{$IFnDEF TestPointer} {$DEFINE NO_TYPE}
   {$IFnDEF TestAssign}
   pre__CharStatArray{e}     _O2_ array[1..5] of char       _EQ_      (CHR1, 'b',CHR1, 'B','c');                //@@ _pre3_CharStatArray{e3};
   pre__WCharStatArray{e}    _O2_ array[1..5] of widechar   _EQ_      (CHR1, 'b',CHR1, 'B','d');                //@@ _pre3_WCharStatArray{e3};
@@ -351,7 +351,7 @@
   pre__ArrayEnum2{e}    := _pre2_ArrayEnum2;    pre__ArrayEnum2{e}[EnVal1]    := 300+ADD;   //@@ _pre3_ArrayEnum2{e3}; // }}
   pre__ArrayEnumSub2{e} := _pre2_ArrayEnumSub2; pre__ArrayEnumSub2{e}[EnVal1] := 400+ADD;   //@@ _pre3_ArrayEnumSub2{e3}; // }}
   {$ENDIF}
-{$ENDIF} // TestPointer
+{$ENDIF} {$UNDEF NO_TYPE} // TestPointer
 {$ENDIF}
 {$ENDIF}
 
@@ -511,10 +511,10 @@
 
 {$IFnDEF TestParam}
 {$IFnDEF TestArg}
-{$IFnDEF TestPointer}
+{$IFnDEF TestPointer} {$DEFINE NO_TYPE}
   pre__Set2{e}      _O2_ set of TEnum       _EQ_ ([EnVal1, EnVal4]);      //@@ _pre3_Set2{e3};
   pre__SmallSet2{e} _O2_ set of TSmallRange _EQ_ ([21, 24,25]);           //@@ _pre3_SmallSet2{e3};
-{$ENDIF}
+{$ENDIF} {$UNDEF NO_TYPE}
 {$ENDIF}
 {$ENDIF}
 
diff --git a/components/lazdebuggers/lazdebugtestbase/ttestwatchutilities.pas b/components/lazdebuggers/lazdebugtestbase/ttestwatchutilities.pas
index e7d0fd0400..2e3db10469 100644
--- a/components/lazdebuggers/lazdebugtestbase/ttestwatchutilities.pas
+++ b/components/lazdebuggers/lazdebugtestbase/ttestwatchutilities.pas
@@ -1320,7 +1320,7 @@ begin
   if not AWaitForEval then
     exit(True);
 
-  for i := 1 to 5 do begin
+  for i := 1 to 50 do begin
     Application.Idle(False);
     Result := AWatchExp^.TstWatch.Values[AThreadId, AWatchExp^.TstStackFrame].Validity <> ddsRequested;
     if Result then break;