Merge branch 'devel' of github.com:RWTH-OS/HermitCore into devel

.travis.yml

@@ -6,10 +6,10 @@ language: c
 compiler: gcc
 before_install:
   - echo "deb https://dl.bintray.com/rwth-os/hermitcore vivid main" | sudo tee -a /etc/apt/sources.list
-  - 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 packaging-dev
+  - travis_retry sudo apt-get -qq update
+  - travis_retry sudo apt-get install -y curl qemu-system-x86 nasm texinfo libmpfr-dev libmpc-dev libgmp-dev libisl-dev flex bison packaging-dev
   #- sudo apt-get install -y --force-yes binutils-hermit gcc-hermit-bootstrap
-  - sudo apt-get install -y --force-yes binutils-hermit libhermit newlib-hermit pthread-embedded-hermit gcc-hermit
+  - travis_retry sudo apt-get install -y --force-yes binutils-hermit libhermit newlib-hermit pthread-embedded-hermit gcc-hermit
   - git submodule update --init lwip usr/libomp
 
 script:
@@ -20,6 +20,7 @@ script:
   - debuild -e PATH -us -uc -j2
   - sudo dpkg -i ../libhermit*_amd64.deb
   - make -j2 examples
+  - if [ "$TRAVIS_BRANCH" != "production" ]; then make test; fi
 
 deploy:
   on: production

Makefile.in

@@ -196,7 +196,7 @@ examples:
 		PROFILING_CFLAGS="$(PROFILING_CFLAGS)" \
 		PROFILING_LDFLAGS="$(PROFILING_LDFLAGS)" -C usr examples
 
-test: demo
+test:
 	. ./test.sh
 
 qemu:

test.sh

@@ -4,7 +4,7 @@
 # it is written only for internal tests via Travis CI
 
 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
+PROXY=/opt/hermit/bin/proxy
 
 for f in $FILES; do echo "check $f..."; $PROXY $f || exit 1; done