From a0663233bc4b51891b3abf45d26ad5302ca3a17d Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Sun, 25 Nov 2018 18:20:07 +0100
Subject: [PATCH] fix #360 - The command "test project" should not require to
 manually select the unittest config

---
 src/ce_dubproject.pas | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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