Browse Source

[LibOS] test/apps: Rewrite LMBench 2.5 example

Chia-Che Tsai 6 years ago
parent
commit
5384141b97

+ 2 - 2
Jenkinsfiles/Linux

@@ -68,7 +68,7 @@ pipeline {
                         timeout(time: 15, unit: 'MINUTES') {
                             sh '''
                                 cd LibOS/shim/test/apps/lmbench
-                                make regression N_RUNS=1 ENOUGH=100
+                                make test N_RUNS=1 ENOUGH=100
                             '''
                         }
                         sh '''
@@ -111,7 +111,7 @@ pipeline {
                            make -C LibOS/shim/test/apps/bash clean
                            make -C LibOS/shim/test/apps/curl clean
                            make -C LibOS/shim/test/apps/gcc clean
-                           make -C LibOS/shim/test/apps/lmbench clean
+                           make -C LibOS/shim/test/apps/lmbench distclean
                            make -C LibOS/shim/test/apps/lighttpd distclean
                            make -C LibOS/shim/test/apps/nginx distclean
                            make -C LibOS/shim/test/apps/apache distclean

+ 1 - 1
Jenkinsfiles/Linux-18.04

@@ -64,7 +64,7 @@ pipeline {
                         timeout(time: 15, unit: 'MINUTES') {
                             sh '''
                                 cd LibOS/shim/test/apps/lmbench
-                                make regression N_RUNS=1 ENOUGH=100
+                                make test N_RUNS=1 ENOUGH=100
                             '''
                         }
                         sh '''

+ 2 - 2
Jenkinsfiles/Linux-Debug

@@ -66,7 +66,7 @@ pipeline {
                         timeout(time: 20, unit: 'MINUTES') {
                             sh '''
                                 cd LibOS/shim/test/apps/lmbench
-                                make regression N_RUNS=1 ENOUGH=100
+                                make test N_RUNS=1 ENOUGH=100
                             '''
                         }
                         sh '''
@@ -107,7 +107,7 @@ pipeline {
                            make -C LibOS/shim/test/apps/bash clean
                            make -C LibOS/shim/test/apps/curl clean
                            make -C LibOS/shim/test/apps/gcc clean
-                           make -C LibOS/shim/test/apps/lmbench clean
+                           make -C LibOS/shim/test/apps/lmbench distclean
                            make -C LibOS/shim/test/apps/lighttpd distclean
                            make -C LibOS/shim/test/apps/nginx distclean
                            make -C LibOS/shim/test/apps/apache distclean

+ 1 - 1
Jenkinsfiles/Linux-Debug-18.04

@@ -61,7 +61,7 @@ pipeline {
                         timeout(time: 20, unit: 'MINUTES') {
                             sh '''
                                 cd LibOS/shim/test/apps/lmbench
-                                make regression N_RUNS=1 ENOUGH=100
+                                make test N_RUNS=1 ENOUGH=100
                             '''
                         }
                         sh '''

+ 3 - 3
Jenkinsfiles/Linux-SGX

@@ -110,8 +110,8 @@ pipeline {
                         timeout(time: 15, unit: 'MINUTES') {
                             sh '''
                                 cd LibOS/shim/test/apps/lmbench
-                                make SGX=1 all sgx-tokens
-                                make SGX=1 regression N_RUNS=1 ENOUGH=100
+                                make SGX=1 all
+                                make SGX=1 test N_RUNS=1 ENOUGH=100
                             '''
                         }
                         sh '''
@@ -153,7 +153,7 @@ pipeline {
                            make -C LibOS/shim/test/apps/bash SGX=1 clean
                            make -C LibOS/shim/test/apps/curl SGX=1 clean
                            make -C LibOS/shim/test/apps/gcc SGX=1 clean
-                           make -C LibOS/shim/test/apps/lmbench SGX=1 clean
+                           make -C LibOS/shim/test/apps/lmbench SGX=1 distclean
                            make -C LibOS/shim/test/apps/lighttpd SGX=1 distclean
                            make -C LibOS/shim/test/apps/nginx SGX=1 distclean
                            make -C LibOS/shim/test/apps/apache SGX=1 distclean

+ 2 - 2
Jenkinsfiles/Linux-SGX-18.04

@@ -107,8 +107,8 @@ pipeline {
                         timeout(time: 15, unit: 'MINUTES') {
                             sh '''
                                 cd LibOS/shim/test/apps/lmbench
-                                make SGX=1 all sgx-tokens
-                                make SGX=1 regression N_RUNS=1 ENOUGH=100
+                                make SGX=1 all
+                                make SGX=1 test N_RUNS=1 ENOUGH=100
                             '''
                         }
                         sh '''

+ 1 - 1
LibOS/shim/test/apps

@@ -1 +1 @@
-Subproject commit 9bd47420abf79fda0f7993dd2524435bf9eada21
+Subproject commit 32469e4a20a0f7b8658894bcdd8b9aa92509cf74