Skip to content

Commit bd9d5f7

Browse files
committed
Don't pass runtime log when not running parallelized
1 parent d100250 commit bd9d5f7

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

rake/spec.rb

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ def write_config(filename)
4646
end
4747
end
4848
write_config(logfile)
49-
abort unless system("bundle exec #{TEST_COMMAND} --runtime-log .parallel_runtime_rspec.log #{paths} 2>/dev/null")
49+
runtime_log = TEST_COMMAND =~ /parallel/ ? '--runtime-log .parallel_runtime_rspec.log' : ''
50+
cmd = "bundle exec #{TEST_COMMAND} #{runtime_log} #{paths} 2>/dev/null"
51+
abort unless system(cmd)
5052
f1 = File.open(File.expand_path('../.parallel_runtime_integration.log', File.dirname(__FILE__)), 'w')
5153
f2 = File.open(File.expand_path('../.parallel_runtime_tests.log', File.dirname(__FILE__)), 'w')
5254
File.read(logfile).split(/\n/).each do |line|
@@ -68,7 +70,8 @@ def write_config(filename)
6870
abort('Puppet binary missing. Please run script/bootstrap!') unless File.file?(PUPPET_BINARY)
6971
begin
7072
write_config('.parallel_runtime_integration.log')
71-
cmd = "bundle exec #{TEST_COMMAND} --runtime-log .parallel_runtime_integration.log spec/octocatalog-diff/integration"
73+
runtime_log = TEST_COMMAND =~ /parallel/ ? '--runtime-log .parallel_runtime_integration.log' : ''
74+
cmd = "bundle exec #{TEST_COMMAND} #{runtime_log} spec/octocatalog-diff/integration 2>/dev/null"
7275
abort unless system(cmd)
7376
ensure
7477
FileUtils.rm PARALLEL_CONFIG if File.file?(PARALLEL_CONFIG)
@@ -79,7 +82,8 @@ def write_config(filename)
7982
abort('Puppet binary missing. Please run script/bootstrap!') unless File.file?(PUPPET_BINARY)
8083
begin
8184
write_config('.parallel_runtime_tests.log')
82-
cmd = "bundle exec #{TEST_COMMAND} --runtime-log .parallel_runtime_tests.log spec/octocatalog-diff/tests"
85+
runtime_log = TEST_COMMAND =~ /parallel/ ? '--runtime-log .parallel_runtime_tests.log' : ''
86+
cmd = "bundle exec #{TEST_COMMAND} #{runtime_log} spec/octocatalog-diff/tests 2>/dev/null"
8387
abort unless system(cmd)
8488
ensure
8589
FileUtils.rm PARALLEL_CONFIG if File.file?(PARALLEL_CONFIG)

0 commit comments

Comments
 (0)