No more ubygems.rb in trunk / 2.5. Change -rubygems to -rrubygems (#1442

)
puma · Oct 19, 2017 · 2ffa7cd · 2ffa7cd
1 parent ae6b1ce
commit 2ffa7cd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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"