tests: pass widgetset name to lazbuild

git-svn-id: trunk@17137 -
This commit is contained in:
vincents 2008-10-27 14:21:05 +00:00
parent f0b96b997f
commit 8b2b41eae0
4 changed files with 8 additions and 5 deletions

View File

@ -6,7 +6,6 @@
<General> <General>
<SessionStorage Value="InIDEConfig"/> <SessionStorage Value="InIDEConfig"/>
<MainUnit Value="0"/> <MainUnit Value="0"/>
<IconPath Value="./"/>
<TargetFileExt Value=".exe"/> <TargetFileExt Value=".exe"/>
</General> </General>
<VersionInfo> <VersionInfo>

View File

@ -23,8 +23,9 @@ unit BugTestCase;
interface interface
uses uses
Classes, SysUtils, Math, process, FileUtil, AsyncProcess, fpcunit, Classes, SysUtils, Math, process, fpcunit, testregistry,
testregistry, TestGlobals; FileUtil, AsyncProcess, InterfaceBase,
TestGlobals;
type type
@ -95,6 +96,7 @@ begin
CmdLine := CmdLine + ' --compiler='+Compiler; CmdLine := CmdLine + ' --compiler='+Compiler;
if PrimaryConfigPath<>'' then if PrimaryConfigPath<>'' then
CmdLine := CmdLine + ' --pcp='+PrimaryConfigPath; CmdLine := CmdLine + ' --pcp='+PrimaryConfigPath;
Cmdline := Cmdline + ' --ws=' + LCLPlatformDirNames[WidgetSet.LCLPlatform];
CmdLine:=CmdLine + ' ' + FProjectFile; CmdLine:=CmdLine + ' ' + FProjectFile;
LazBuild.CommandLine := CmdLine; LazBuild.CommandLine := CmdLine;
LazBuild.CurrentDirectory := FPath; LazBuild.CurrentDirectory := FPath;

View File

@ -6,7 +6,6 @@
<General> <General>
<SessionStorage Value="InIDEConfig"/> <SessionStorage Value="InIDEConfig"/>
<MainUnit Value="0"/> <MainUnit Value="0"/>
<IconPath Value="./"/>
<TargetFileExt Value=".exe"/> <TargetFileExt Value=".exe"/>
</General> </General>
<PublishOptions> <PublishOptions>

View File

@ -24,7 +24,7 @@ interface
uses uses
Classes, SysUtils, strutils, fpcunit, testregistry, process, AsyncProcess, Classes, SysUtils, strutils, fpcunit, testregistry, process, AsyncProcess,
FileUtil, InterfaceBase, FileUtil,
TestGlobals; TestGlobals;
type type
@ -152,6 +152,7 @@ begin
CmdLine:=Cmdline + ' --compiler='+Compiler; CmdLine:=Cmdline + ' --compiler='+Compiler;
if PrimaryConfigPath<>'' then if PrimaryConfigPath<>'' then
CmdLine := CmdLine + ' --pcp='+PrimaryConfigPath; CmdLine := CmdLine + ' --pcp='+PrimaryConfigPath;
Cmdline := Cmdline + ' --ws=' + LCLPlatformDirNames[WidgetSet.LCLPlatform];
Cmdline := Cmdline + ' -B ' + FPath; Cmdline := Cmdline + ' -B ' + FPath;
LazBuild.CommandLine := CmdLine; LazBuild.CommandLine := CmdLine;
LazBuild.CurrentDirectory := ExtractFileDir(FPath); LazBuild.CurrentDirectory := ExtractFileDir(FPath);
@ -176,8 +177,10 @@ end;
class function TLpiTest.CreateSuiteFromFile(const AName, class function TLpiTest.CreateSuiteFromFile(const AName,
APath: string): TTestSuite; APath: string): TTestSuite;
{$IFDEF win32}
var var
AhkFileName: String; AhkFileName: String;
{$ENDIF}
begin begin
Result := inherited CreateSuiteFromFile(AName, APath); Result := inherited CreateSuiteFromFile(AName, APath);
{$IFDEF win32} {$IFDEF win32}