[Truffle] Move the integration tests to use a less common port.

jruby · Mar 8, 2016 · 1c6422f · 1c6422f
1 parent aea5938
commit 1c6422f
Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/test/truffle/integration/common/test_server.sh.inc b/test/truffle/integration/common/test_server.sh.inc
@@ -1,4 +1,4 @@
-PORT=8080
+PORT=14873
 
 function test_server {
   serverpid=$!

diff --git a/test/truffle/integration/instrumentation-server.sh b/test/truffle/integration/instrumentation-server.sh
@@ -2,16 +2,18 @@
 
 set -e
 
-ruby -X+T -Xtruffle.instrumentation_server_port=8080 test/truffle/integration/instrumentation-server/subject.rb &
+PORT=14873
+
+ruby -X+T -Xtruffle.instrumentation_server_port=$PORT test/truffle/integration/instrumentation-server/subject.rb &
 pid=$!
 
-while ! (curl -s http://localhost:8080/stacks > /dev/null);
+while ! (curl -s http://localhost:$PORT/stacks > /dev/null);
 do
   echo -n .
   sleep 1
 done
 
-if [[ $(curl -s http://localhost:8080/stacks) != *"test/truffle/integration/instrumentation-server/subject.rb:1"* ]]
+if [[ $(curl -s http://localhost:$PORT/stacks) != *"test/truffle/integration/instrumentation-server/subject.rb:1"* ]]
 then
   echo Expected line not found in stacks
   exit 1
@@ -21,16 +23,16 @@ kill -9 $pid || true
 wait $pid || true
 
 ( echo backtrace ; echo 20000+1400 ; echo continue ) > in.txt
-ruby -X+T -Xtruffle.instrumentation_server_port=8080 test/truffle/integration/instrumentation-server/subject.rb < in.txt > out.txt &
+ruby -X+T -Xtruffle.instrumentation_server_port=$PORT test/truffle/integration/instrumentation-server/subject.rb < in.txt > out.txt &
 pid=$!
 
-while ! (curl -s http://localhost:8080/stacks > /dev/null);
+while ! (curl -s http://localhost:$PORT/stacks > /dev/null);
 do
   echo -n .
   sleep 1
 done
 
-curl -s http://localhost:8080/break
+curl -s http://localhost:$PORT/break
 
 sleep 1
 kill -9 $pid || true

diff --git a/test/truffle/integration/rack-server/rack-server.rb b/test/truffle/integration/rack-server/rack-server.rb
@@ -16,5 +16,5 @@ def call(env)
 
 Rack::Handler::WEBrick.run(
   Example.new,
-  :Port => 8080
+  :Port => 14873
 )
diff --git a/test/truffle/integration/sinatra-server/sinatra-server.rb b/test/truffle/integration/sinatra-server/sinatra-server.rb
@@ -8,7 +8,7 @@
 
 require 'sinatra'
 
-set :port, 8080
+set :port, 14873
 
 get '/' do
   "Hello Sinatra!"

diff --git a/test/truffle/integration/tcp-server/tcp-server.rb b/test/truffle/integration/tcp-server/tcp-server.rb
@@ -8,7 +8,7 @@
 
 require 'socket'
 
-server = TCPServer.new('localhost', 8080)
+server = TCPServer.new('localhost', 14873)
 
 loop do
   socket = server.accept

diff --git a/test/truffle/integration/webrick-server/webrick-server.rb b/test/truffle/integration/webrick-server/webrick-server.rb
@@ -8,7 +8,7 @@
 
 require 'webrick'
 
-server = WEBrick::HTTPServer.new(:Port => 8080)
+server = WEBrick::HTTPServer.new(:Port => 14873)
 
 server.mount_proc '/' do |req, res|
   res.body = "Hello, world!\n"