@@ -121,9 +121,11 @@ bool runCommand(string[] args, string desc, Verbosity verbosity, Mutex outputMut
121
121
}
122
122
123
123
bool hasOutput;
124
- if ((verbosity & Verbosity.outputCommandAlways) || ( ! r && (verbosity & Verbosity.outputOnError) ))
124
+ if (! r && (verbosity & Verbosity.outputOnError))
125
125
hasOutput = true ;
126
- if ((verbosity & Verbosity.outputAlways) || (! r && (verbosity & Verbosity.outputOnError)))
126
+ if (verbosity & Verbosity.outputCommandAlways)
127
+ hasOutput = true ;
128
+ if ((verbosity & Verbosity.outputAlways) && (app.data.length || wrongOutput))
127
129
hasOutput = true ;
128
130
129
131
bool anyOutput;
@@ -438,7 +440,7 @@ bool runGrammarTests(Test[] tests, string model, Verbosity verbosity,
438
440
foreach (ref testBundle; parallel(testBundles, 1 ))
439
441
{
440
442
if (! runCommand(testBundle.dmdArgs,
441
- " Compiling " ~ testBundle.filename, verbosity, outputMutex))
443
+ " Compiling " ~ testBundle.filename, verbosity | Verbosity.outputAlways , outputMutex))
442
444
testBundle.failed = true ;
443
445
}
444
446
}
@@ -447,7 +449,7 @@ bool runGrammarTests(Test[] tests, string model, Verbosity verbosity,
447
449
foreach (ref testBundle; testBundles)
448
450
{
449
451
if (! runCommand(testBundle.dmdArgs,
450
- " Compiling " ~ testBundle.filename, verbosity, outputMutex))
452
+ " Compiling " ~ testBundle.filename, verbosity | Verbosity.outputAlways , outputMutex))
451
453
testBundle.failed = true ;
452
454
}
453
455
}
@@ -648,7 +650,7 @@ int main(string[] args)
648
650
compiler, " -g" , " -w" , " -m" ~ model, " -i=dparsergen" , " -Icore" ,
649
651
" -Igenerator" , " generator/dparsergen/generator/generator.d" ,
650
652
" -of" ~ generator
651
- ], " Compiling dparsergen" , verbosity, outputMutex))
653
+ ], " Compiling dparsergen" , verbosity | Verbosity.outputAlways , outputMutex))
652
654
return 1 ;
653
655
654
656
if (! runCommand([
@@ -711,7 +713,7 @@ int main(string[] args)
711
713
{
712
714
dmdArgsGeneratortests ~= e.name;
713
715
}
714
- if (! runCommand(dmdArgsGeneratortests, " Compiling generatortests" , verbosity, outputMutex))
716
+ if (! runCommand(dmdArgsGeneratortests, " Compiling generatortests" , verbosity | Verbosity.outputAlways , outputMutex))
715
717
{
716
718
anyFailure = true ;
717
719
}
0 commit comments