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

.travis.yml

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

Makefile

@@ -82,8 +82,8 @@ check-vendor:
 	./script/check-vendor.sh
 
 # 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
 .PHONY: test-image
@@ -91,8 +91,8 @@ test-image:
 	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)
-.PHONY: test
+.PHONY: test-container
-test:
+test-container:
 	docker run -v `pwd`:/opt/tmp/kompose:ro -it $(TEST_IMAGE) 
 
 

script/test_in_container/run.sh

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