aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorPiotr Krysik <ptrkrysik@gmail.com>2018-02-20 13:00:31 +0100
committerPiotr Krysik <ptrkrysik@gmail.com>2018-02-20 13:00:31 +0100
commit398fd8b934345b0bf0422a20f02d9e241571a1c9 (patch)
tree2523ed3074c1f23f0a5adfc335bf075e33e7af91 /.travis.yml
parentde9db85e344c2488c96e282af1f7fab09ca9eb02 (diff)
Added 'make test' as part of docker files and removed it from travis.yml
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml8
1 files changed, 4 insertions, 4 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