diff options
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | tests/dockerfiles/Debian_testing.docker | 3 | ||||
| -rw-r--r-- | tests/dockerfiles/Ubuntu_16_04.docker | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index b97817d..034ede2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,12 @@ sudo: required language: ruby env: - #- DOCKERFILE=tests/dockerfiles/Debian_Jessie.docker IMGNAME=debjess-grgsm - #- DOCKERFILE=tests/dockerfiles/Ubuntu_15_04.docker IMGNAME=ubu15.04-grgsm - #- DOCKERFILE=tests/dockerfiles/Debian_testing.docker IMGNAME=debtest-grgsm + - DOCKERFILE=tests/dockerfiles/Debian_testing.docker IMGNAME=debtest-grgsm + - DOCKERFILE=tests/dockerfiles/Debian_testing_package.docker IMGNAME=debtest-grgsm-package - DOCKERFILE=tests/dockerfiles/Ubuntu_16_04.docker IMGNAME=ubu16.04-grgsm - DOCKERFILE=tests/dockerfiles/Kali.docker IMGNAME=kali-grgsm + services: - docker @@ -16,5 +16,5 @@ before_install: - cat $DOCKERFILE > Dockerfile ; docker build -t $IMGNAME . script: - - docker run -it --rm $IMGNAME sh -c 'cd /src/build;make test' +# - docker run -it --rm $IMGNAME sh -c 'cd /src/build;make test' - docker run -it --rm $IMGNAME /src/tests/scripts/decode.sh diff --git a/tests/dockerfiles/Debian_testing.docker b/tests/dockerfiles/Debian_testing.docker index c87e7dd..9cdd389 100644 --- a/tests/dockerfiles/Debian_testing.docker +++ b/tests/dockerfiles/Debian_testing.docker @@ -24,4 +24,5 @@ WORKDIR /src/build RUN cmake .. && \ make && \ make install && \ - ldconfig + ldconfig && \ + make test diff --git a/tests/dockerfiles/Ubuntu_16_04.docker b/tests/dockerfiles/Ubuntu_16_04.docker index 695bfab..e56b87f 100644 --- a/tests/dockerfiles/Ubuntu_16_04.docker +++ b/tests/dockerfiles/Ubuntu_16_04.docker @@ -24,4 +24,5 @@ WORKDIR /src/build RUN cmake .. && \ make && \ make install && \ - ldconfig + ldconfig && \ + make test |