Forráskód Böngészése

[LibOS] test/apps: Fix up apache and lighttpd tests

Michał Kowalczyk 4 éve
szülő
commit
09907126ed

+ 2 - 2
Jenkinsfiles/Linux

@@ -61,14 +61,14 @@ pipeline {
                             make
                             make start-graphene-server &
                             sleep 1
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8000
                             '''
                         sh '''
                             cd LibOS/shim/test/apps/apache
                             make
                             make start-graphene-server &
                             sleep 1
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8001
                             '''
                     }
                     post {

+ 2 - 2
Jenkinsfiles/Linux-18.04

@@ -56,14 +56,14 @@ pipeline {
                             make
                             make start-graphene-server &
                             sleep 1
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8000
                             '''
                         sh '''
                             cd LibOS/shim/test/apps/apache
                             make
                             make start-graphene-server &
                             sleep 1
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8001
                             '''
                     }
                     post {

+ 2 - 2
Jenkinsfiles/Linux-Debug

@@ -53,14 +53,14 @@ pipeline {
                             make
                             make start-graphene-server &
                             sleep 1
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8000
                             '''
                         sh '''
                             cd LibOS/shim/test/apps/apache
                             make
                             make start-graphene-server &
                             sleep 1
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8001
                             '''
                     }
                     post {

+ 2 - 2
Jenkinsfiles/Linux-Debug-18.04

@@ -53,14 +53,14 @@ pipeline {
                             make
                             make start-graphene-server &
                             sleep 1
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8000
                             '''
                         sh '''
                             cd LibOS/shim/test/apps/apache
                             make
                             make start-graphene-server &
                             sleep 1
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8001
                             '''
                     }
                     post {

+ 2 - 2
Jenkinsfiles/Linux-SGX

@@ -87,7 +87,7 @@ pipeline {
                             make SGX_RUN=1
                             make SGX_RUN=1 start-graphene-server &
                             sleep 10
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8000
                             '''
                         sh '''
                             cd LibOS/shim/test/apps/apache
@@ -95,7 +95,7 @@ pipeline {
                             make SGX_RUN=1
                             make SGX_RUN=1 start-graphene-server &
                             sleep 15
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8001
                             '''
                     }
                     post {

+ 2 - 2
Jenkinsfiles/Linux-SGX-18.04

@@ -87,7 +87,7 @@ pipeline {
                             make SGX_RUN=1
                             make SGX_RUN=1 start-graphene-server &
                             sleep 10
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8000
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8000
                             '''
                             /*
                         sh '''
@@ -96,7 +96,7 @@ pipeline {
                             make SGX_RUN=1
                             make SGX_RUN=1 start-graphene-server &
                             sleep 15
-                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh `hostname -I|tr -d '[:space:]'`:8001
+                            LOOP=1 CONCURRENCY_LIST="1 32" ./benchmark-http.sh 127.0.0.1:8001
                             '''
                             */
                     }

+ 1 - 1
LibOS/shim/test/apps

@@ -1 +1 @@
-Subproject commit a16912e96f7e279b8cf0473b5b0bab70f50d8437
+Subproject commit f42dcccb78d7dd8ea35529a4301f588c58eb41de