@@ -46,7 +46,9 @@ def write_config(filename)
46
46
end
47
47
end
48
48
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 )
50
52
f1 = File . open ( File . expand_path ( '../.parallel_runtime_integration.log' , File . dirname ( __FILE__ ) ) , 'w' )
51
53
f2 = File . open ( File . expand_path ( '../.parallel_runtime_tests.log' , File . dirname ( __FILE__ ) ) , 'w' )
52
54
File . read ( logfile ) . split ( /\n / ) . each do |line |
@@ -68,7 +70,8 @@ def write_config(filename)
68
70
abort ( 'Puppet binary missing. Please run script/bootstrap!' ) unless File . file? ( PUPPET_BINARY )
69
71
begin
70
72
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"
72
75
abort unless system ( cmd )
73
76
ensure
74
77
FileUtils . rm PARALLEL_CONFIG if File . file? ( PARALLEL_CONFIG )
@@ -79,7 +82,8 @@ def write_config(filename)
79
82
abort ( 'Puppet binary missing. Please run script/bootstrap!' ) unless File . file? ( PUPPET_BINARY )
80
83
begin
81
84
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"
83
87
abort unless system ( cmd )
84
88
ensure
85
89
FileUtils . rm PARALLEL_CONFIG if File . file? ( PARALLEL_CONFIG )
0 commit comments