forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #360 - The command "test project" should not require to manually select the unittest config

This commit is contained in:
Basile Burg 2018-11-25 18:20:07 +01:00
parent be56b05f50
commit a0663233bc
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ce_dubproject.pas
View File

@ -66,6 +66,7 @@ type
fCompiler: DCompiler; fCompiler: DCompiler;
fShowConsole: boolean; fShowConsole: boolean;
fAutoFetch: boolean; fAutoFetch: boolean;
fAutoSelectTestConfig: boolean;
procedure setLinkMode(value: TDubLinkMode); procedure setLinkMode(value: TDubLinkMode);
procedure setCompiler(value: DCompiler); procedure setCompiler(value: DCompiler);
function getCompiler: DCompiler; function getCompiler: DCompiler;
@ -81,6 +82,7 @@ type
property verbosity: TDubVerbosity read fVerbosity write fVerbosity default default; property verbosity: TDubVerbosity read fVerbosity write fVerbosity default default;
property archOverride: TDubArchOverride read fArchOverride write fArchOverride default auto; property archOverride: TDubArchOverride read fArchOverride write fArchOverride default auto;
property autoFetch: boolean read fAutoFetch write fAutoFetch default false; property autoFetch: boolean read fAutoFetch write fAutoFetch default false;
property autoSelectTestConfig: boolean read fAutoSelectTestConfig write fAutoSelectTestConfig default true;
public public
procedure assign(source: TPersistent); override; procedure assign(source: TPersistent); override;
procedure getOpts(options: TStrings); procedure getOpts(options: TStrings);
@ -551,6 +553,7 @@ begin
verbosity:=opts.verbosity; verbosity:=opts.verbosity;
archOverride:=opts.archOverride; archOverride:=opts.archOverride;
autoFetch:=opts.autoFetch; autoFetch:=opts.autoFetch;
fAutoSelectTestConfig:=opts.fAutoSelectTestConfig;
end end
else inherited; else inherited;
end; end;
@ -599,6 +602,7 @@ begin
inherited; inherited;
fBackup := TCEDubBuildOptionsBase.Create(nil); fBackup := TCEDubBuildOptionsBase.Create(nil);
EntitiesConnector.addObserver(self); EntitiesConnector.addObserver(self);
autoSelectTestConfig := true;
fname := getDocPath + optFname; fname := getDocPath + optFname;
if fname.fileExists then if fname.fileExists then
loadFromFile(fname); loadFromFile(fname);
@ -1030,9 +1034,12 @@ begin
fDubProc.XTermProgram:=consoleProgram; fDubProc.XTermProgram:=consoleProgram;
fDubProc.Parameters.Add(dubCmd2Arg[command]); fDubProc.Parameters.Add(dubCmd2Arg[command]);
fDubProc.OnTerminate:= @dubProcTerminated; fDubProc.OnTerminate:= @dubProcTerminated;
if (command <> dcTest) or not dubBuildOptions.autoSelectTestConfig then
begin
fDubProc.Parameters.Add('--build=' + fBuildTypes[fBuiltTypeIx]); fDubProc.Parameters.Add('--build=' + fBuildTypes[fBuiltTypeIx]);
if (fConfigs.Count <> 1) and (fConfigs[0] <> DubDefaultConfigName) then if (fConfigs.Count <> 1) and (fConfigs[0] <> DubDefaultConfigName) then
fDubProc.Parameters.Add('--config=' + fConfigs[fConfigIx]); fDubProc.Parameters.Add('--config=' + fConfigs[fConfigIx]);
end;
fDubProc.Parameters.Add('--compiler=' + DubCompilerFilename); fDubProc.Parameters.Add('--compiler=' + DubCompilerFilename);
dubBuildOptions.getOpts(fDubProc.Parameters); dubBuildOptions.getOpts(fDubProc.Parameters);
if (command <> dcBuild) and runArgs.isNotEmpty then if (command <> dcBuild) and runArgs.isNotEmpty then