paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-22 02:09:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fix test for targets not having a real wide string

Browse Source 
git-svn-id: trunk@47637 -
This commit is contained in:
florian 2020-11-29 20:53:15 +00:00
parent 706d89d6cc
commit b7e2b751cf
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/webtbs/tw17904.pp
View File

@ -164,7 +164,11 @@ begin
test('date: ', v.foo(cl.dt, cl.dtprop), varDate); test('date: ', v.foo(cl.dt, cl.dtprop), varDate);
test('ansistr: ', v.foo(cl.fastr, cl.astr), varStrArg); test('ansistr: ', v.foo(cl.fastr, cl.astr), varStrArg);
{$ifdef FPC_WINLIKEWIDESTRING}
test('widestr: ', v.foo(cl.fwstr, cl.wstr), varOleStr); test('widestr: ', v.foo(cl.fwstr, cl.wstr), varOleStr);
{$else FPC_WINLIKEWIDESTRING}
test('widestr: ', v.foo(cl.fwstr, cl.wstr), varUStrArg);
{$endif FPC_WINLIKEWIDESTRING}
{$ifdef fpc} {$ifdef fpc}
test('unistr: ', v.foo(cl.fustr, cl.ustr), varUStrArg); test('unistr: ', v.foo(cl.fustr, cl.ustr), varUStrArg);
{$endif} {$endif}
@ -174,8 +178,12 @@ begin
test('IDispatch:', v.foo(cl.fdisp, cl.dispprop), varDispatch); test('IDispatch:', v.foo(cl.fdisp, cl.dispprop), varDispatch);
// not an COM type, passed by value; Delphi uses varStrArg // not an COM type, passed by value; Delphi uses varStrArg
{$ifdef FPC_WINLIKEWIDESTRING}
test('shortstr:', v.foo(cl.fsstr, cl.sstr), -varOleStr); test('shortstr:', v.foo(cl.fsstr, cl.sstr), -varOleStr);
// not an COM type, passed by value {$else FPC_WINLIKEWIDESTRING}
test('shortstr:', v.foo(cl.fsstr, cl.sstr), -varUStrArg);
{$endif FPC_WINLIKEWIDESTRING}
// not an COM type, passed by value
test('longbool:', v.foo(cl.lb, cl.lbprop), -varBoolean); test('longbool:', v.foo(cl.lb, cl.lbprop), -varBoolean);
// typecasted ordinals (only one arg is actually used) // typecasted ordinals (only one arg is actually used)

5
tests/webtbs/tw5086.pp
View File

@ -28,6 +28,9 @@ begin
erase(input); erase(input);
end; end;
var
p : pbyte;
procedure dfs(a, b, c, k1: Byte); procedure dfs(a, b, c, k1: Byte);
var var
x : Byte; x : Byte;
@ -52,6 +55,8 @@ begin
end; end;
begin begin
// p:=@a;
if (k1 > k) then Exit; if (k1 > k) then Exit;
if (a = 1) or (b = 1) or (c = 1) then begin if (a = 1) or (b = 1) or (c = 1) then begin
answ := answ + 1; answ := answ + 1;