mirror of
https://github.com/puma/puma.git
synced 2022-11-09 13:48:40 -05:00
No more ubygems.rb in trunk / 2.5. Change -rubygems to -rrubygems (#1442)
This commit is contained in:
parent
ae6b1cef9a
commit
2ffa7cd7c0
4 changed files with 5 additions and 5 deletions
|
@ -1,5 +1,5 @@
|
|||
results = %w[t1 t2 t3].map do |test|
|
||||
system("ruby -rubygems test/shell/#{test}.rb ") # > /dev/null 2>&1
|
||||
system("ruby -rrubygems test/shell/#{test}.rb ") # > /dev/null 2>&1
|
||||
end
|
||||
|
||||
if results.any? { |r| r != true }
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
system "ruby -rubygems -Ilib bin/puma -p 10102 -C test/shell/t1_conf.rb test/rackup/hello.ru &"
|
||||
system "ruby -rrubygems -Ilib bin/puma -p 10102 -C test/shell/t1_conf.rb test/rackup/hello.ru &"
|
||||
sleep 5
|
||||
system "curl http://localhost:10102/"
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
system "ruby -rubygems -Ilib bin/pumactl -F test/shell/t2_conf.rb start"
|
||||
system "ruby -rrubygems -Ilib bin/pumactl -F test/shell/t2_conf.rb start"
|
||||
sleep 5
|
||||
system "curl http://localhost:10103/"
|
||||
|
||||
system "ruby -rubygems -Ilib bin/pumactl -F test/shell/t2_conf.rb stop"
|
||||
system "ruby -rrubygems -Ilib bin/pumactl -F test/shell/t2_conf.rb stop"
|
||||
|
||||
sleep 1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
system "ruby -rubygems -Ilib bin/puma -p 10102 -C test/shell/t3_conf.rb test/rackup/hello.ru &"
|
||||
system "ruby -rrubygems -Ilib bin/puma -p 10102 -C test/shell/t3_conf.rb test/rackup/hello.ru &"
|
||||
sleep 5
|
||||
|
||||
worker_pid_was_present = File.file? "t3-worker-2-pid"
|
||||
|
|
Loading…
Reference in a new issue