From 2ffa7cd7c0c9627517bdc143c62e290e2b2844bd Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Thu, 19 Oct 2017 16:49:31 -0500 Subject: [PATCH] No more ubygems.rb in trunk / 2.5. Change -rubygems to -rrubygems (#1442) --- test/shell/run.rb | 2 +- test/shell/t1.rb | 2 +- test/shell/t2.rb | 4 ++-- test/shell/t3.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/shell/run.rb b/test/shell/run.rb index 9845085f85..8c83a3925e 100644 --- a/test/shell/run.rb +++ b/test/shell/run.rb @@ -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 } diff --git a/test/shell/t1.rb b/test/shell/t1.rb index 5071817fa3..25c523e426 100644 --- a/test/shell/t1.rb +++ b/test/shell/t1.rb @@ -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/" diff --git a/test/shell/t2.rb b/test/shell/t2.rb index 348057b59b..d48fc856cf 100644 --- a/test/shell/t2.rb +++ b/test/shell/t2.rb @@ -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 diff --git a/test/shell/t3.rb b/test/shell/t3.rb index 6218add9ce..9b0dafd7d5 100644 --- a/test/shell/t3.rb +++ b/test/shell/t3.rb @@ -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"