From 620840c586af456ba4023de6d7419de228e0f358 Mon Sep 17 00:00:00 2001 From: martin Date: Tue, 13 May 2014 20:42:21 +0000 Subject: [PATCH] FpGdbmiDebugger: tests git-svn-id: trunk@45031 - --- .../test/TestApps/TestWatchesUnitSimple.pas | 12 ++++++------ .../lazdebuggerfpgdbmi/test/testwatches.pas | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/components/lazdebuggers/lazdebuggerfpgdbmi/test/TestApps/TestWatchesUnitSimple.pas b/components/lazdebuggers/lazdebuggerfpgdbmi/test/TestApps/TestWatchesUnitSimple.pas index b273d02b0e..9c42ac89a9 100644 --- a/components/lazdebuggers/lazdebuggerfpgdbmi/test/TestApps/TestWatchesUnitSimple.pas +++ b/components/lazdebuggers/lazdebuggerfpgdbmi/test/TestApps/TestWatchesUnitSimple.pas @@ -459,9 +459,9 @@ begin Field_Set1 := [eval2]; Field_Set2 := []; - Field_SString1 := 'stest'; + Field_SString1 := 'stest ü1'+#27+''; Field_SString2 := ''; - Field_AString1 := 'atest'; + Field_AString1 := 'atest ü1'+#27+''; Field_AString2 := ''; @@ -604,9 +604,9 @@ begin Local_Set1 := [eval2]; Local_Set2 := []; - Local_SString1 := 'stest'; + Local_SString1 := 'stest ü1'+#27+''; Local_SString2 := ''; - Local_AString1 := 'atest'; + Local_AString1 := 'atest ü1'+#27+''; Local_AString2 := ''; @@ -837,9 +837,9 @@ begin SimpleGlob_Set1 := [eval2]; SimpleGlob_Set2 := []; - SimpleGlob_SString1 := 'stest'; + SimpleGlob_SString1 := 'stest ü1'+#27+''; SimpleGlob_SString2 := ''; - SimpleGlob_AString1 := 'atest'; + SimpleGlob_AString1 := 'atest ü1'+#27+''; SimpleGlob_AString2 := ''; diff --git a/components/lazdebuggers/lazdebuggerfpgdbmi/test/testwatches.pas b/components/lazdebuggers/lazdebuggerfpgdbmi/test/testwatches.pas index f184332f50..b168165191 100644 --- a/components/lazdebuggers/lazdebuggerfpgdbmi/test/testwatches.pas +++ b/components/lazdebuggers/lazdebuggerfpgdbmi/test/testwatches.pas @@ -791,6 +791,9 @@ begin FLastAddedExp^.DspFormat := wdfMemDump; AddFmtDef('%sDynInt1%1:s[1]', [s,s2], Sp2RegEx('^\$?[0-9A-F]+: *((00 00 15 88)|(88 15 00 00)) *$'), skArray, '', [fTpMtch]); FLastAddedExp^.DspFormat := wdfMemDump; + AddFmtDef('%sDynInt1%1:s[1]', [s,s2], Sp2RegEx('^\$?[0-9A-F]+: *((00 00 15 88)|(88 15 00 00)) +[0-9A-F][0-9A-F]'), skArray, '', [fTpMtch]); + FLastAddedExp^.DspFormat := wdfMemDump; + FLastAddedExp^.RepeatCount := 5; end; // 6600 = $19C8 / 6699=$1A2B @@ -798,6 +801,9 @@ begin FLastAddedExp^.DspFormat := wdfMemDump; AddFmtDef('%sStatAInt1%1:s[5]', [s,s2], Sp2RegEx('^\$?[0-9A-F]+: *((00 00 19 C9)|(C9 19 00 00)) *$'), skArray, '', [fTpMtch]); FLastAddedExp^.DspFormat := wdfMemDump; + AddFmtDef('%sStatAInt1%1:s[5]', [s,s2], Sp2RegEx('^\$?[0-9A-F]+: *((00 00 19 C9)|(C9 19 00 00)) +[0-9A-F][0-9A-F]'), skArray, '', [fTpMtch]); + FLastAddedExp^.DspFormat := wdfMemDump; + FLastAddedExp^.RepeatCount := 5; // Test: typecast dynarray to dynarray AddFmtDef('TArrayDynInt(%sDynInt1%1:s)', [s,s2], '^[\(L].*?5511, 5512, 5513, 5514, -5511', skArray, '', [fTpMtch]);