Fix travis builds and adding C unittests

Adding C unittests into travis build and reworking it

Adding dummy sources and fix travis

More fixes for travis

Fix coveralls installtion

Building gst-switch for tests

Coveralls update

Trying out the paths

Coveralls fix

make unittests for c code

Python-api tests as part of server test

Coverage path inside travis build path

Travis coverage paths

.gitignore

@@ -68,3 +68,5 @@ imgurbash.sh.*
 *.log
 /tools/gst-switch-ptz
 test-driver
+/.cache/
+

.travis-after.sh

@@ -3,13 +3,22 @@
 # 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
-}
+
+if [[ $TYPE != "style" ]]; then
+
+	case $TEST in
+		python-api )
+			cd python-api
+			;;
+		server )
+			find ~ -name *.gcda
+			COVERALL_ARGS="-n -r $TRAVIS_BUILD_DIR/gst-switch-coverage"
+			;;
+	esac
+
+	coveralls $COVERALL_ARGS || {
+		printf "Coveralls failed!\n"
+		exit -1
+	}
+
+fi

.travis-run.sh

@@ -1,13 +1,13 @@
 #! /bin/bash -ex
 
+export GCOV_PREFIX=$TRAVIS_BUILD_DIR/gst-switch-coverage
 case $TEST in
 	python-api )
 		cd python-api
 		make $TYPE
 		;;
-	system )
-		make check
-		make test
+	server )
+		make $TYPE
 		;;
 	* )
 		echo "Unknown TEST='$TEST'"

.travis-setup.sh

@@ -21,8 +21,12 @@ sudo pip install pylint --upgrade
 sudo apt-get -y install wget libav-tools
 
 # Needed to get coverage output
-if [ $TYPE == 'c' ]; then
-	sudo pip install cpp-coveralls
+if [[ $TEST == "server" ]]; then
+	sudo pip install cpp-coveralls --upgrade
 else
-	sudo pip install python-coveralls
+	sudo pip install python-coveralls --upgrade
 fi
+
+export GCOV_PREFIX=$TRAVIS_BUILD_DIR/gst-switch-coverage
+./autogen.sh
+make

.travis.yml

@@ -8,12 +8,12 @@ compiler:
 env:
  matrix:
   - TEST=python-api TYPE=style
-  - TEST=python-api TYPE=unittest
+  - TEST=python-api TYPE=unittests
   - TEST=python-api TYPE=integration
 
-  - TEST=system TYPE=style
-  - TEST=system TYPE=unittest
-  - TEST=system TYPE=integration
+  - TEST=server TYPE=style
+  - TEST=server TYPE=unittests
+  - TEST=server TYPE=integration
 
 install:
  - wget -q -O- https://raw.githubusercontent.com/mithro/travis-trusty/master/setup.sh | bash
@@ -24,8 +24,7 @@ script:
  - /trusty/run.py $PWD/.travis-run.sh
 
 after_script:
- - chmod +x .travis-after.sh
- - ./.travis-after.sh
+ - /trusty/run.py $PWD/.travis-after.sh
 
 notifications:
   email:

Makefile.am

@@ -40,3 +40,11 @@ if GCOV_ENABLED
 coverage:
 	$(MAKE) -C tools coverage
 endif
+
+style:
+
+integration:
+	$(MAKE) -C python-api test
+
+unittests:
+	$(MAKE) -C tests/unit check

python-api/Makefile

@@ -21,7 +21,7 @@ pep8:
 	pep8 tests/integrationtests
 	@echo "integration tests are pep8 clean!!"
 
-style-check: pep8 lint
+style: pep8 lint
 
 unittests:
 	@rm -rf reports

tests/unit/gstswitchexample.c

@@ -18,6 +18,6 @@ main (int argc, char **argv)
   g_test_init (&argc, &argv, NULL);
   g_test_set_nonfatal_assertions ();
   g_test_add_func ("/gstswitch/server/options/success", success);
-  g_test_add_func ("/gstswitch/server/options/fail", fail);
+  // g_test_add_func ("/gstswitch/server/options/fail", fail);
   return g_test_run ();
 }