Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from Oct 19, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/shell/run.rb
View file
Open in desktop
@@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion test/shell/t1.rb
View file
Open in desktop
@@ -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/"

Expand Down
4 changes: 2 additions & 2 deletions test/shell/t2.rb
View file
Open in desktop
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion test/shell/t3.rb
View file
Open in desktop
@@ -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"
Expand Down