paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-18 14:42:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

FpDebug, test: fix test.

Browse Source 
git-svn-id: trunk@61418 -
This commit is contained in:
martin 2019-06-18 18:39:20 +00:00
parent f2698e4d03
commit 9341db12f7
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
components/lazdebuggers/lazdebuggerfp/test/testwatches.pas
View File

@ -5,10 +5,9 @@ unit TestWatches;
interface interface
uses uses
Classes, SysUtils, fpcunit, testutils, testregistry, TestBase, TestDbgControl, Classes, SysUtils, fpcunit, testregistry, TestBase, TestDbgControl,
TestDbgTestSuites, TTestDebuggerClasses, TestOutputLogger, TestDbgTestSuites, TestOutputLogger, TTestWatchUtilities, TestCommonSources,
TTestWatchUtilities, TestCommonSources, TestDbgConfig, DbgIntfDebuggerBase, TestDbgConfig, DbgIntfDebuggerBase, DbgIntfBaseTypes, Forms;
DbgIntfBaseTypes, Forms;
type type
@ -678,10 +677,10 @@ if not(ALoc in [tlConst]) then begin
t.Add(AName, p+'WideString5'+e, weWideStr(AChr1+'XcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghij', t.Add(AName, p+'WideString5'+e, weWideStr(AChr1+'XcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghijAbcdefghij',
'TWStrTA')) .IgnKindPtr; 'TWStrTA')) .IgnKindPtr;
t.Add(AName, p+'WideString2'+e+'[1]', weWideChar(AChr1)) .CharFromIndex; t.Add(AName, p+'WideString2'+e+'[1]', weWideChar(AChr1)) .CharFromIndex.IgnTypeName(stDwarf3Up);
t.Add(AName, p+'WideString2'+e+'[2]', weWideChar('a')) .CharFromIndex; t.Add(AName, p+'WideString2'+e+'[2]', weWideChar('a')) .CharFromIndex.IgnTypeName(stDwarf3Up);
t.Add(AName, p+'WideString5'+e+'[1]', weWideChar(AChr1)) .CharFromIndex; t.Add(AName, p+'WideString5'+e+'[1]', weWideChar(AChr1)) .CharFromIndex.IgnTypeName(stDwarf3Up);
t.Add(AName, p+'WideString5'+e+'[2]', weWideChar('X')) .CharFromIndex; t.Add(AName, p+'WideString5'+e+'[2]', weWideChar('X')) .CharFromIndex.IgnTypeName(stDwarf3Up);
//TODO wePWidechar //TODO wePWidechar
t.Add(AName, p+'PWideChar'+e, wePointer(weWideStr(''), 'PWideChar')); t.Add(AName, p+'PWideChar'+e, wePointer(weWideStr(''), 'PWideChar'));
@ -788,7 +787,7 @@ end;
t.Add(AName, p+'Enum2'+e, weEnum('EnVal21', 'TEnum2')); t.Add(AName, p+'Enum2'+e, weEnum('EnVal21', 'TEnum2'));
t.Add(AName, p+'Enum3'+e, weEnum('EnVal25', 'TEnum2')); t.Add(AName, p+'Enum3'+e, weEnum('EnVal25', 'TEnum2'));
t.Add(AName, p+'Set'+e, weSet(['EnVal2', 'EnVal4'], 'TSet')); t.Add(AName, p+'Set'+e, weSet(['EnVal2', 'EnVal4'], 'TSet')).Skip([stDwarf]);
t.Add(AName, p+'IntfUnknown'+e, weMatch('.?', skInterface)).Skip(); // only run eval / do not crash t.Add(AName, p+'IntfUnknown'+e, weMatch('.?', skInterface)).Skip(); // only run eval / do not crash
@ -799,9 +798,9 @@ var
dbg: TDebuggerIntf; dbg: TDebuggerIntf;
t: TWatchExpectationList; t: TWatchExpectationList;
Src: TCommonSource; Src: TCommonSource;
n, cl: Integer;
BrkPrg, BrkFooBegin, BrkFoo, BrkFooVar, BrkFooVarBegin, BrkPrg, BrkFooBegin, BrkFoo, BrkFooVar, BrkFooVarBegin,
BrkFooConstRef: TDBGBreakPoint; BrkFooConstRef: TDBGBreakPoint;
cl: Integer;
begin begin
if SkipTest then exit; if SkipTest then exit;
if not TestControlCanTest(ControlTestWatchValue) then exit; if not TestControlCanTest(ControlTestWatchValue) then exit;

4
components/lazdebuggers/lazdebugtestbase/ttestwatchutilities.pas
View File

@ -429,7 +429,7 @@ begin
Result := Default(TWatchExpectationResult); Result := Default(TWatchExpectationResult);
if ATypeName = #1 then ATypeName := 'WideString'; if ATypeName = #1 then ATypeName := 'WideString';
Result.ExpResultKind := rkWideString; Result.ExpResultKind := rkWideString;
Result.ExpSymKind := skAnsiString; // TODO Result.ExpSymKind := skWideString;
Result.ExpTypeName := ATypeName; Result.ExpTypeName := ATypeName;
Result.ExpTextData := AExpVal; Result.ExpTextData := AExpVal;
end; end;
@ -439,7 +439,7 @@ begin
Result := Default(TWatchExpectationResult); Result := Default(TWatchExpectationResult);
if ATypeName = #1 then ATypeName := 'UnicodeString'; if ATypeName = #1 then ATypeName := 'UnicodeString';
Result.ExpResultKind := rkWideString; Result.ExpResultKind := rkWideString;
Result.ExpSymKind := skWideString; // TODO Result.ExpSymKind := skWideString;
Result.ExpTypeName := ATypeName; Result.ExpTypeName := ATypeName;
Result.ExpTextData := AExpVal; Result.ExpTextData := AExpVal;
end; end;