Starting travis rework

.travis-after.sh

@@ -0,0 +1,15 @@
+#! /bin/bash -ex
+#
+# This script runs after everything has finished. It should be used to upload
+# any build assets, logs and coverage information.
+
+case $TEST in
+	system )
+		COVERALL_ARGS="-n -r $HOME/gst-switch-coverage"
+		;;
+esac
+
+coveralls $COVERALL_ARGS || {
+	printf "Coveralls failed!\n"
+	exit -1
+}

.travis-run.sh

@@ -1,67 +1,16 @@
 #! /bin/bash -ex
 
-./autogen.sh --prefix=/usr || {
-  printf "Failed to do autogen!!!\n"
-  exit -1
-}
-make clean
-make || {
-  printf "make of gst-switch failed!!!\n"
-  exit -1
-}
-sudo make install || {
-  printf "make install of gst-switch failed!!!\n"
-  exit -1
-}
-
-cd python-api
-
 case $TEST in
-
 	python-api )
-		case $TYPE in
-			unittest )
-				make unittests || {
-					printf "Unittests failed!\n"
-					exit -1
-				}
-				coveralls || {
-					printf "Coveralls failed!\n"
-					exit -1
-				}
-				;;
-			integration )
-				make integration || {
-					printf "Integration tests failed!\n"
-					exit -1
-				}
-				coveralls || {
-					printf "Coveralls failed!\n"
-					exit -1
-				}
-				;;
-		esac
+		cd python-api
+		make $TYPE
+		;;
+	system )
+		make check
+		make test
+		;;
+	* )
+		echo "Unknown TEST='$TEST'"
+		exit -1
 		;;
-	module )
-		case $TYPE in
-			python )
-				make test || {
-					printf "Tests failed!\n"
-					exit -1
-				}
-				coveralls || {
-					printf "Coveralls failed!\n"
-					exit -1
-				}
-				;;
-			c )
-				make test || {
-					printf "Tests failed!\n"
-					exit -1
-				}
-				coveralls -n -r ../tools
-		esac
-esac || {
-	printf "Failed!\n!\n"
-	exit -1
-}
+esac

.travis.yml

@@ -1,3 +1,4 @@
+#vim :
 language: 
  - c
 
@@ -6,10 +7,13 @@ compiler:
 
 env:
  matrix:
+  - TEST=python-api TYPE=style
   - TEST=python-api TYPE=unittest
   - TEST=python-api TYPE=integration
-  - TEST=module TYPE=python
-  - TEST=module TYPE=c
+
+  - TEST=system TYPE=style
+  - TEST=system TYPE=unittest
+  - TEST=system TYPE=integration
 
 install:
  - wget -q -O- https://raw.githubusercontent.com/mithro/travis-trusty/master/setup.sh | bash
@@ -19,6 +23,10 @@ install:
 script:
  - /trusty/run.py $PWD/.travis-run.sh
 
+after_script:
+ - chmod +x .travis-after.sh
+ - ./.travis-after.sh
+
 notifications:
   email:
     - gst-switch-spam@googlegroups.com

python-api/Makefile

@@ -1,4 +1,4 @@
-.PHONY: lint unittests pytest integration test clean all
+.PHONY: lint pep8 style-check unittests integration performance test clean
 
 lint: export PYTHONWARNINGS := ignore
 lint: export PYTHONPATH := ${PYTHONPATH}:${PWD}
@@ -13,12 +13,6 @@ lint:
 	pylint --rcfile=.pylintrc_integrationtests tests/integrationtests/*.py
 	@echo "Code style is okay!!"
 
-unittests:
-	@rm -rf reports
-	@mkdir -p reports/coverage/unittests
-	py.test --cov gstswitch tests/unittests/ --pep8 -v -s
-	@make clean
-
 pep8:
 	pep8 gstswitch
 	@echo "gstswitch is pep8 clean!!"
@@ -27,6 +21,15 @@ pep8:
 	pep8 tests/integrationtests
 	@echo "integration tests are pep8 clean!!"
 
+style-check: pep8 lint
+
+unittests:
+	@rm -rf reports
+	@mkdir -p reports/coverage/unittests
+	py.test --cov gstswitch tests/unittests/ --pep8 -v -s
+	@make clean
+
+
 integration:
 	@rm -f ../tools/*.c.gcov
 	@rm -f ../tools/*.gcda
@@ -42,6 +45,8 @@ performance:
 	py.test tests/performancetests/*.py -v -s
 	make clean
 
+test: unittests integration clean
+
 clean:
 	rm -rf .cache
 	rm -rf reports
@@ -53,5 +58,3 @@ clean:
 	rm -f *.sh
 	rm -f .coverage
 
-
-test: lint unittests integration clean