diff --git a/.ci/lib/stage-clean-check.jenkinsfile b/.ci/lib/stage-clean-check.jenkinsfile index b4aeb19443..730a119c54 100644 --- a/.ci/lib/stage-clean-check.jenkinsfile +++ b/.ci/lib/stage-clean-check.jenkinsfile @@ -21,8 +21,8 @@ stage('clean-check') { make -C Examples/memcached distclean make -C Examples/redis distclean make -C Examples/lighttpd distclean - make -C Examples/nginx distclean - make -C Examples/apache distclean + #make -C Examples/nginx distclean + #make -C Examples/apache distclean make -C Examples/blender distclean make -C Examples/r distclean make -C Pal/src PAL_HOST=Skeleton clean diff --git a/.ci/lib/stage-test-direct.jenkinsfile b/.ci/lib/stage-test-direct.jenkinsfile index a94566e78f..0373531dde 100644 --- a/.ci/lib/stage-test-direct.jenkinsfile +++ b/.ci/lib/stage-test-direct.jenkinsfile @@ -79,25 +79,25 @@ stage('test-direct') { LOOP=1 CONCURRENCY_LIST="1 32" ../common_tools/benchmark-http.sh 127.0.0.1:8003 ''' } - timeout(time: 10, unit: 'MINUTES') { - sh ''' - cd Examples/nginx - make -j8 all - make start-graphene-server & - sleep 1 - LOOP=1 CONCURRENCY_LIST="1 32" ../common_tools/benchmark-http.sh 127.0.0.1:8002 - ''' - } - timeout(time: 20, unit: 'MINUTES') { - sh ''' - cd Examples/apache - make -j8 all - make start-graphene-server & - sleep 1 - LOOP=1 CONCURRENCY_LIST="1 32" ../common_tools/benchmark-http.sh 127.0.0.1:8001 - LOOP=1 CONCURRENCY_LIST="1 32" ../common_tools/benchmark-http.sh https://127.0.0.1:8443 - ''' - } + // timeout(time: 10, unit: 'MINUTES') { + // sh ''' + // cd Examples/nginx + // make -j8 all + // make start-graphene-server & + // sleep 1 + // LOOP=1 CONCURRENCY_LIST="1 32" ../common_tools/benchmark-http.sh 127.0.0.1:8002 + // ''' + // } + // timeout(time: 20, unit: 'MINUTES') { + // sh ''' + // cd Examples/apache + // make -j8 all + // make start-graphene-server & + // sleep 1 + // LOOP=1 CONCURRENCY_LIST="1 32" ../common_tools/benchmark-http.sh 127.0.0.1:8001 + // LOOP=1 CONCURRENCY_LIST="1 32" ../common_tools/benchmark-http.sh https://127.0.0.1:8443 + // ''' + // } timeout(time: 5, unit: 'MINUTES') { sh ''' cd Examples/blender diff --git a/.ci/lib/stage-test-sgx.jenkinsfile b/.ci/lib/stage-test-sgx.jenkinsfile index ff2170cd5d..dedaf7d032 100644 --- a/.ci/lib/stage-test-sgx.jenkinsfile +++ b/.ci/lib/stage-test-sgx.jenkinsfile @@ -72,25 +72,25 @@ stage('test-sgx') { LOOP=1 CONCURRENCY_LIST="1 32" ../common_tools/benchmark-http.sh 127.0.0.1:8003 ''' } - timeout(time: 15, unit: 'MINUTES') { - sh ''' - cd Examples/nginx - make ${MAKEOPTS} - make ${MAKEOPTS} start-graphene-server & - sleep 30 - LOOP=1 CONCURRENCY_LIST="1 32" ../common_tools/benchmark-http.sh 127.0.0.1:8002 - ''' - } - timeout(time: 25, unit: 'MINUTES') { - sh ''' - cd Examples/apache - make ${MAKEOPTS} - make ${MAKEOPTS} start-graphene-server & - sleep 30 - LOOP=1 CONCURRENCY_LIST="1 32" ../common_tools/benchmark-http.sh 127.0.0.1:8001 - LOOP=1 CONCURRENCY_LIST="1 32" ../common_tools/benchmark-http.sh https://127.0.0.1:8443 - ''' - } + // timeout(time: 15, unit: 'MINUTES') { + // sh ''' + // cd Examples/nginx + // make ${MAKEOPTS} + // make ${MAKEOPTS} start-graphene-server & + // sleep 30 + // LOOP=1 CONCURRENCY_LIST="1 32" ../common_tools/benchmark-http.sh 127.0.0.1:8002 + // ''' + // } + // timeout(time: 25, unit: 'MINUTES') { + // sh ''' + // cd Examples/apache + // make ${MAKEOPTS} + // make ${MAKEOPTS} start-graphene-server & + // sleep 30 + // LOOP=1 CONCURRENCY_LIST="1 32" ../common_tools/benchmark-http.sh 127.0.0.1:8001 + // LOOP=1 CONCURRENCY_LIST="1 32" ../common_tools/benchmark-http.sh https://127.0.0.1:8443 + // ''' + // } timeout(time: 5, unit: 'MINUTES') { sh ''' cd Examples/blender diff --git a/LibOS/shim/src/sys/shim_mmap.c b/LibOS/shim/src/sys/shim_mmap.c index cb12cdaf32..8f6ffa8429 100644 --- a/LibOS/shim/src/sys/shim_mmap.c +++ b/LibOS/shim/src/sys/shim_mmap.c @@ -77,6 +77,8 @@ void* shim_do_mmap(void* addr, size_t length, int prot, int flags, int fd, off_t if (flags & MAP_ANONYMOUS) { switch (flags & MAP_TYPE) { case MAP_SHARED: + /* PAL API doesn't support anonymous shared memory. */ + return (void*)-ENOSYS; case MAP_PRIVATE: break; default: diff --git a/LibOS/shim/test/ltp/ltp.cfg b/LibOS/shim/test/ltp/ltp.cfg index 96306e3d5e..389db47caa 100644 --- a/LibOS/shim/test/ltp/ltp.cfg +++ b/LibOS/shim/test/ltp/ltp.cfg @@ -676,6 +676,10 @@ skip = yes [futex_cmp_requeue01] skip = yes +# uses anonymous shared mappings (which are not supported) +[futex_cmp_requeue02] +skip = yes + # always fails to open /proc/PID/stat, but the whole test fails only sometimes [futex_wait02] skip = yes