deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Rename some make targests: test->test-container test-all->test

Browse Source
This commit is contained in:
Tomas Kral 2017-01-23 15:04:29 +01:00
parent 20b844d6e9
commit 0b1b7f3c35
No known key found for this signature in database
GPG Key ID: E690DA7E4F291FA6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -20,7 +20,7 @@ install:
- true - true
script: script:
- make test-all - make test
# gover collects all .coverprofile files and saves it to one file gover.coverprofile # gover collects all .coverprofile files and saves it to one file gover.coverprofile
- gover - gover
- goveralls -coverprofile=gover.coverprofile -service=travis-ci - goveralls -coverprofile=gover.coverprofile -service=travis-ci

8
Makefile
View File

@ -82,8 +82,8 @@ check-vendor:
./script/check-vendor.sh ./script/check-vendor.sh
# Run all tests # Run all tests
.PHONY: test-all .PHONY: test
test-all: check-vendor validate test-unit-cover install test-cmd test: check-vendor validate test-unit-cover install test-cmd
# build docker image that is used for running all test localy # build docker image that is used for running all test localy
.PHONY: test-image .PHONY: test-image
@ -91,8 +91,8 @@ test-image:
docker build -t $(TEST_IMAGE) -f script/test_in_container/Dockerfile script/test_in_container/ docker build -t $(TEST_IMAGE) -f script/test_in_container/Dockerfile script/test_in_container/
# run all test localy in docker image (image can be build by by build-test-image target) # run all test localy in docker image (image can be build by by build-test-image target)
.PHONY: test .PHONY: test-container
test: test-container:
docker run -v `pwd`:/opt/tmp/kompose:ro -it $(TEST_IMAGE) docker run -v `pwd`:/opt/tmp/kompose:ro -it $(TEST_IMAGE)

2
script/test_in_container/run.sh
View File

@ -22,4 +22,4 @@ set -e
# We can be sure that this container won't modify any files on hosts disk. # We can be sure that this container won't modify any files on hosts disk.
cp -r $KOMPOSE_TMP_SRC/ $(dirname $KOMPOSE_SRC) cp -r $KOMPOSE_TMP_SRC/ $(dirname $KOMPOSE_SRC)
make test-all make test