Fix --nocapture for run-make tests
#134111
+68
−56
Merged