add application option to skip unittests in action verify with Dscanner

This commit is contained in:
Basile Burg 2016-05-13 04:21:21 +02:00
parent 5d95330d50
commit b27b2dd8ff
1 changed files with 10 additions and 0 deletions

View File

@ -217,6 +217,7 @@ type
fRunnableDestination: string; fRunnableDestination: string;
fSymStringExpander: ICESymStringExpander; fSymStringExpander: ICESymStringExpander;
fCovModUt: boolean; fCovModUt: boolean;
fDscanUnittests: boolean;
fAlwaysUseDest: boolean; fAlwaysUseDest: boolean;
fDoc: TCESynMemo; fDoc: TCESynMemo;
fFirstTimeCoedit: boolean; fFirstTimeCoedit: boolean;
@ -403,6 +404,7 @@ type
fDcdPort: word; fDcdPort: word;
fRunnableDest: TCEPathname; fRunnableDest: TCEPathname;
fAlwaysUseDest: boolean; fAlwaysUseDest: boolean;
fDscanUnittests: boolean;
function getAdditionalPATH: string; function getAdditionalPATH: string;
procedure setAdditionalPATH(const value: string); procedure setAdditionalPATH(const value: string);
function getDubCompiler: TCECompiler; function getDubCompiler: TCECompiler;
@ -421,6 +423,7 @@ type
property nativeProjecCompiler: TCECompiler read getNativeProjecCompiler write setNativeProjecCompiler; property nativeProjecCompiler: TCECompiler read getNativeProjecCompiler write setNativeProjecCompiler;
property runnableDestination: TCEPathname read fRunnableDest write setRunnableDestination; property runnableDestination: TCEPathname read fRunnableDest write setRunnableDestination;
property runnableDestinationAlways: boolean read fAlwaysUseDest write fAlwaysUseDest; property runnableDestinationAlways: boolean read fAlwaysUseDest write fAlwaysUseDest;
property dscanUnittests: boolean read fDscanUnittests write fDscanUnittests default true;
// published for ICEEditableOptions but stored by DCD wrapper since it reloads before CEMainForm // published for ICEEditableOptions but stored by DCD wrapper since it reloads before CEMainForm
property dcdPort: word read fDcdPort write fDcdPort stored false; property dcdPort: word read fDcdPort write fDcdPort stored false;
@ -457,6 +460,7 @@ begin
inherited; inherited;
fBackup := TCEApplicationOptionsBase.Create(self); fBackup := TCEApplicationOptionsBase.Create(self);
EntitiesConnector.addObserver(self); EntitiesConnector.addObserver(self);
fDscanUnittests := true;
end; end;
function TCEApplicationOptionsBase.getDubCompiler: TCECompiler; function TCEApplicationOptionsBase.getDubCompiler: TCECompiler;
@ -528,6 +532,7 @@ begin
fCovModUt:= CEMainForm.fCovModUt; fCovModUt:= CEMainForm.fCovModUt;
fRunnableDest := CEMainForm.fRunnableDestination; fRunnableDest := CEMainForm.fRunnableDestination;
fAlwaysUseDest := CEMainForm.fAlwaysUseDest; fAlwaysUseDest := CEMainForm.fAlwaysUseDest;
fDscanUnittests := CEMainForm.fDscanUnittests;
end else if src = fBackup then end else if src = fBackup then
begin begin
fCovModUt:=fBackup.fCovModUt; fCovModUt:=fBackup.fCovModUt;
@ -538,6 +543,7 @@ begin
fFloatingWidgetOnTop := fBackup.fFloatingWidgetOnTop; fFloatingWidgetOnTop := fBackup.fFloatingWidgetOnTop;
CEMainForm.fRunnableDestination := fBackup.fRunnableDest; CEMainForm.fRunnableDestination := fBackup.fRunnableDest;
CEmainForm.fAlwaysUseDest := fBackup.fAlwaysUseDest; CEmainForm.fAlwaysUseDest := fBackup.fAlwaysUseDest;
CEMainForm.fDscanUnittests := fDscanUnittests;
end end
else inherited; else inherited;
end; end;
@ -552,6 +558,7 @@ begin
CEMainForm.updateFloatingWidgetOnTop(fFloatingWidgetOnTop); CEMainForm.updateFloatingWidgetOnTop(fFloatingWidgetOnTop);
CEMainForm.fRunnableDestination := fRunnableDest; CEMainForm.fRunnableDestination := fRunnableDest;
CEMainForm.fAlwaysUseDest := fAlwaysUseDest; CEMainForm.fAlwaysUseDest := fAlwaysUseDest;
CEMainForm.fDscanUnittests := fDscanUnittests;
DcdWrapper.port:=fDcdPort; DcdWrapper.port:=fDcdPort;
end else if dst = fBackup then end else if dst = fBackup then
begin begin
@ -563,6 +570,7 @@ begin
fBackup.fCovModUt:=fCovModUt; fBackup.fCovModUt:=fCovModUt;
fBackup.fRunnableDest:= fRunnableDest; fBackup.fRunnableDest:= fRunnableDest;
fBackup.fAlwaysUseDest := fAlwaysUseDest; fBackup.fAlwaysUseDest := fAlwaysUseDest;
fBackup.fDscanUnittests:= fDscanUnittests;
end end
else inherited; else inherited;
end; end;
@ -2236,6 +2244,8 @@ begin
prc.ShowWindow:= swoHIDE; prc.ShowWindow:= swoHIDE;
prc.Parameters.Add(fDoc.fileName); prc.Parameters.Add(fDoc.fileName);
prc.Parameters.Add('-S'); prc.Parameters.Add('-S');
if not fDscanUnittests then
prc.Parameters.Add('--skipTests');
prc.Execute; prc.Execute;
processOutputToStrings(prc, lst); processOutputToStrings(prc, lst);
for msg in lst do for msg in lst do