timvideos · Jan 30, 2015 · Jan 30, 2015 · Jan 30, 2015 · Jan 30, 2015 · Jan 30, 2015
Showing with 103 additions and 66 deletions.

+26 −0 .travis-after.sh

+12 −49 .travis-run.sh

+7 −3 .travis-setup.sh

+10 −3 .travis.yml

+17 −0 Makefile.am

+13 −9 python-api/Makefile

+1 −0 scripts/apps/app_indent.sh

+17 −2 tests/unit/Makefile.am
diff --git a/.travis-after.sh b/.travis-after.sh
@@ -0,0 +1,26 @@
+#! /bin/bash -ex
+#
+# This script runs after everything has finished. It should be used to upload
+# any build assets, logs and coverage information.
+
+
+if [[ $TYPE == "style" ]]; then
+	exit 0
+fi
+
+make coverage
+
+case $TEST in
+	python-api )
+		cd python-api
+		;;
+	server )
+		cd tools
+		;;
+esac
+
+coveralls $COVERALL_ARGS || {
+	printf "Coveralls failed!\n"
+	exit -1
+}
+
diff --git a/.travis-run.sh b/.travis-run.sh
@@ -1,7 +1,5 @@
 #! /bin/bash -ex
 
-export DISPLAY=:99.0
-
 ./autogen.sh --prefix=/usr || {
   printf "Failed to do autogen!!!\n"
   exit -1
@@ -16,54 +14,19 @@ sudo make install || {
   exit -1
 }
 
-cd python-api
+export DISPLAY=:99.0
+export GCOV_PREFIX=$TRAVIS_BUILD_DIR/gst-switch-coverage
 
 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
 		;;
-	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
-}
+	server )
+		make $TYPE
+		;;
+	* )
+		echo "Unknown TEST='$TEST'"
+		exit -1
+		;;
+esac
diff --git a/.travis-setup.sh b/.travis-setup.sh
@@ -20,11 +20,15 @@ sudo pip install pylint --upgrade
 # Needed for tests
 sudo apt-get -y install wget libav-tools
 
+# Needed for style checks
+sudo apt-get -y install indent
+
 # Needed to get coverage output
-if [ $TYPE == 'c' ]; then
-	sudo pip install cpp-coveralls
+sudo apt-get -y install libyaml-dev
+if [[ $TEST == "server" ]]; then
+	sudo pip install cpp-coveralls --upgrade
 else
-	sudo pip install python-coveralls
+	sudo pip install python-coveralls --upgrade
 fi
 
 # Start an X server so the GUI works

diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,4 @@
+#vim :
 language: 
  - c
 
@@ -6,10 +7,13 @@ compiler:
 
 env:
  matrix:
-  - TEST=python-api TYPE=unittest
+  - TEST=python-api TYPE=style
+  - TEST=python-api TYPE=unittests
   - TEST=python-api TYPE=integration
-  - TEST=module TYPE=python
-  - TEST=module TYPE=c
+
+  - 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
@@ -19,6 +23,9 @@ install:
 script:
  - /trusty/run.py $PWD/.travis-run.sh
 
+after_script:
+ - /trusty/run.py $PWD/.travis-after.sh
+
 notifications:
   email:
     - gst-switch-spam@googlegroups.com

diff --git a/Makefile.am b/Makefile.am
@@ -39,7 +39,24 @@ endif
 if GCOV_ENABLED
 coverage:
 	$(MAKE) -C tools coverage
+	$(MAKE) -C tests/unit coverage
 endif
 
+style:
+	git status || true
+	git diff || true
+	git diff-files; echo $$?
+	git diff-files --quiet || (echo "Can only run make style on clean repo"; git status; git diff; git diff-files; exit 1)
+	@echo "--------------------------------------------------------"
+	@echo "--------------------------------------------------------"
+	for i in $$(find -name \*.c -o -name \*.h); do ./scripts/indent $$i; done
+	git diff
+	@echo "--------------------------------------------------------"
+	@echo "--------------------------------------------------------"
+	@git diff-files --quiet || (echo "Style errors found!"; exit 1)
+
+integration:
+	$(MAKE) -C python-api integration
+
 unittests:
 	$(MAKE) -C tests/unit check
diff --git a/python-api/Makefile b/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
-	#-@mv htmlcov/*.* reports/coverage/unittests
-
 pep8:
 	pep8 gstswitch
 	@echo "gstswitch is pep8 clean!!"
@@ -27,10 +21,20 @@ pep8:
 	pep8 tests/integrationtests
 	@echo "integration tests are pep8 clean!!"
 
+style: pep8 lint
+
 imgurbash.sh:
 	-wget http://imgur.com/tools/imgurbash.sh -O imgurbash.sh
 	-chmod +x imgurbash.sh
 
+unittests:
+	@rm -f ../tools/*.c.gcov
+	@rm -f ../tools/*.gcda
+	@rm -rf reports
+	@mkdir -p reports/coverage/unittests
+	py.test --cov gstswitch tests/unittests/ --pep8 -v -s
+	#-@mv htmlcov/*.* reports/coverage/unittests
+
 integration: imgurbash.sh
 	@rm -f ../tools/*.c.gcov
 	@rm -f ../tools/*.gcda
@@ -43,6 +47,8 @@ performance:
 	py.test tests/performancetests/*.py -v -s
 	make clean
 
+test: unittests integration
+
 clean:
 	rm -f *.avi*
 	rm -f *.data*
@@ -53,5 +59,3 @@ clean:
 	rm -f tests/integrationtests/*.data
 	rm -rf .cache
 	rm -rf reports
-
-test: pep8 lint unittests integration clean
diff --git a/scripts/apps/app_indent.sh b/scripts/apps/app_indent.sh
@@ -19,4 +19,5 @@ function main()
 	--leave-preprocessor-space"
 
     $INDENT ${INDENT_PARAMETERS} "$@"
+    $INDENT ${INDENT_PARAMETERS} "$@"
 }
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
@@ -1,6 +1,22 @@
+if GCOV_ENABLED
+# --coverage
+GCOV_CFLAGS = -fprofile-arcs -ftest-coverage
+GCOV_LFLAGS = -fprofile-arcs -ftest-coverage
+#GCOV_CFLAGS = --coverage
+#GCOV_LFLAGS = --coverage
+else
+GCOV_CFLAGS =
+GCOV_LFLAGS =
+endif
+
 include $(top_srcdir)/build/glib-tap.mk
 
-LDADD = $(GTK_LIBS) $(GLIB_LIBS) $(GST_LIBS)
+
+AM_CFLAGS = $(GLIB_CFLAGS) $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
+  $(GST_PLUGINS_BASE_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS) \
+  $(GCOV_CFLAGS) \
+  -DLOG_PREFIX="\"./tests/unit\""
+LDADD = $(GLIB_LIBS) $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS)
 
 test_gstswitchopts_SOURCES = test_gstswitchopts.c
 test_gstswitchopts_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
@@ -15,7 +31,6 @@ test_gst_pipeline_string_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
   $(GCOV_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -DLOG_PREFIX="\"./tests\""
 test_gst_pipeline_string_LDFLAGS = $(GCOV_LFLAGS)
 
-
 dist_test_data = \
   $(NULL)