From b446ed37c7c4ad8b57f46ce0d060155b2e948674 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sat, 26 Nov 2016 19:25:40 +0100 Subject: [PATCH] update travis configuration for the new directory structure --- .travis.yml | 8 ++++---- test.sh | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index c73437d10..7d06b9652 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,19 +7,19 @@ compiler: gcc before_install: - sudo apt-get -qq update - sudo apt-get install -y curl qemu-system-x86 nasm texinfo libmpfr-dev libmpc-dev libgmp-dev libisl-dev flex bison - - git submodule update --init hermit/lwip hermit/usr/gcc hermit/usr/pte hermit/usr/libomp + - git submodule update --init lwip usr/gcc usr/pte usr/libomp script: - ./configure - wget https://www.lankes.org/deploy/newlib.tar.gz - tar xzf newlib.tar.gz - - mv tmp hermit/usr/ - - mv x86 hermit/usr/ + - mv tmp usr/ + - mv x86 usr/ - make T=1 travis - make test env: global: - TOPDIR=`pwd`/../.. - - PROXY_STR=":hermit:M:7:\\x42::`pwd`/RWTH-OS/HermitCore/hermit/tools/proxy" + - PROXY_STR=":hermit:M:7:\\x42::`pwd`/RWTH-OS/HermitCore/tools/proxy" - HERMIT_ISLE=qemu - HERMIT_CPUS=1 - HERMIT_MEM="512M" diff --git a/test.sh b/test.sh index 43c9d35a6..22f800220 100644 --- a/test.sh +++ b/test.sh @@ -3,13 +3,13 @@ # do not use this script # it is written only for internal tests via Travis CI -FILES="hermit/usr/tests/hello hermit/usr/tests/hellof hermit/usr/tests/hello++ hermit/usr/tests/thr_hello hermit/usr/tests/pi hermit/usr/benchmarks/stream hermit/usr/benchmarks/basic" -PROXY=hermit/tools/proxy +FILES="usr/tests/hello usr/tests/hellof usr/tests/hello++ usr/tests/thr_hello usr/tests/pi usr/benchmarks/stream usr/benchmarks/basic" +PROXY=tools/proxy for f in $FILES; do echo "check $f..."; timeout --preserve-status 3m $PROXY $f || exit 1; done # test echo server at port 8000 -$PROXY hermit/usr/tests/server & +$PROXY usr/tests/server & sleep 10 curl http://127.0.0.1:8000/help sleep 1