run cmocka-based tests in Travis CI

funbringer · funbringer · commit 26cb18fd506f · 2017-05-04T18:17:24.000+03:00
diff --git a/Makefile b/Makefile
@@ -75,5 +75,9 @@ isolationcheck: | submake-isolation
 		--temp-config=$(top_srcdir)/$(subdir)/conf.add \
 		--outputdir=./isolation_output \
 		$(ISOLATIONCHECKS)
-partitioning_tests:
+
+python_tests:
 	$(MAKE) -C tests/python partitioning_tests
+
+cmocka_tests:
+	$(MAKE) -C tests/cmocka check
diff --git a/tests/cmocka/Makefile b/tests/cmocka/Makefile
@@ -2,10 +2,11 @@ PG_CONFIG = pg_config
 TOP_SRC_DIR = ../../src
 
 CC = gcc
-CFLAGS = -I $(TOP_SRC_DIR) -I $(shell $(PG_CONFIG) --includedir-server)
+CFLAGS += -I $(TOP_SRC_DIR) -I $(shell $(PG_CONFIG) --includedir-server)
 CFLAGS += -I$(CURDIR)/../../src/include
 CFLAGS += $(shell $(PG_CONFIG) --cflags_sl)
 CFLAGS += $(shell $(PG_CONFIG) --cflags)
+CFLAGS += $(CFLAGS_SL)
 LDFLAGS = -lcmocka
 TEST_BIN = rangeset_tests
 
diff --git a/tests/cmocka/cmocka-1.1.1.tar.xz b/tests/cmocka/cmocka-1.1.1.tar.xz
diff --git a/travis/pg-travis-test.sh b/travis/pg-travis-test.sh
@@ -88,21 +88,49 @@ PGPORT=55435 PGUSER=$USER PG_CONFIG=$config_path make installcheck USE_PGXS=1 ||
 # show diff if it exists
 if test -f regression.diffs; then cat regression.diffs; fi
 
+
 set +u
 
-# create a virtual environment and activate it
+# create virtual environment and activate it
 virtualenv /tmp/envs/pg_pathman
 source /tmp/envs/pg_pathman/bin/activate
 
 # install pip packages
 pip3 install $pip_packages
 
 # run python tests
-make USE_PGXS=1 PG_CONFIG=$config_path partitioning_tests || status=$?
+make USE_PGXS=1 PG_CONFIG=$config_path python_tests || status=$?
+
+# deactivate virtual environment
+deactivate
 
 set -u
 
 
+# install cmake for cmocka
+sudo apt-get -y install -qq cmake
+
+# build & install cmocka
+CMOCKA_VER=1.1.1
+cd tests/cmocka
+tar xf cmocka-$CMOCKA_VER.tar.xz
+cd cmocka-$CMOCKA_VER
+mkdir build && cd build
+cmake ..
+make && sudo make install
+cd ../../../..
+
+# export path to libcmocka.so
+LD_LIBRARY_PATH=/usr/local/lib
+export LD_LIBRARY_PATH
+
+# run cmocka tests (using CFLAGS_SL for gcov)
+make USE_PGXS=1 PG_CONFIG=$config_path CFLAGS_SL="$($config_path --cflags_sl) -coverage" cmocka_tests || status=$?
+
+# remove useless gcov files
+rm -f tests/cmocka/*.gcno
+rm -f tests/cmocka/*.gcda
+
 #generate *.gcov files
 gcov src/*.c src/compat/*.c src/include/*.h src/include/compat/*.h
 
