Skip to content

Commit

Permalink
Suppress GNU make jobserver magic in runtest.rb
Browse files Browse the repository at this point in the history
Fixes google#60

Change-Id: I2f539f5c41f96a302a73f8cc5c44332b4f4cd7d3
  • Loading branch information
Stefan Becker committed Apr 27, 2016
1 parent a8fafa4 commit 18d6f52
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions runtest.rb
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,8 @@ def normalize_kati_log(output)

cleanup
testcases.each do |tc|
cmd = 'make'
# suppress GNU make jobserver magic
cmd = 'MAKEFLAGS= MAKELEVEL= make'
if via_ninja || is_silent_test
cmd += ' -s'
end
Expand Down Expand Up @@ -318,7 +319,8 @@ def normalize_kati_log(output)

run_in_testdir(sh) do |name|
cleanup
cmd = "sh ../../#{sh} make"
# suppress GNU make jobserver magic
cmd = "MAKEFLAGS= MAKELEVEL= sh ../../#{sh} make"
if is_ninja_test
cmd += ' -s'
end
Expand Down

0 comments on commit 18d6f52

Please sign in to comment.