Fix tests

Author: ildus

.gitignore

@@ -12,3 +12,4 @@ regression.out
 pg_pathman--*.sql
 tags
 cscope*
+Dockerfile

.travis.yml

@@ -10,19 +10,16 @@ services:
     - docker
 
 install:
-    - sed -e 's/${CC}/'${CC}/g -e 's/${PG_VERSION}/'${PG_VERSION}/g Dockerfile.tmpl  > Dockerfile
+    - sed -e 's/${CHECK_CODE}/'${CHECK_CODE}/g -e 's/${CC}/'${CC}/g -e 's/${PG_VERSION}/'${PG_VERSION}/g Dockerfile.tmpl  > Dockerfile
     - docker-compose build
 
 script:
     - docker-compose run tests
 
 env:
     - PG_VERSION=10  CHECK_CODE=true CC=clang
-    - PG_VERSION=10  CHECK_CODE=false CC=clang
     - PG_VERSION=9.6 CHECK_CODE=true CC=clang
-    - PG_VERSION=9.6 CHECK_CODE=false CC=clang
     - PG_VERSION=9.5 CHECK_CODE=true CC=clang
-    - PG_VERSION=9.5 CHECK_CODE=false CC=clang
     - PG_VERSION=10  CHECK_CODE=true CC=gcc
     - PG_VERSION=10  CHECK_CODE=false CC=gcc
     - PG_VERSION=9.6 CHECK_CODE=true CC=gcc

Dockerfile.tmpl

@@ -1,14 +1,15 @@
 FROM postgres:${PG_VERSION}-alpine
 
-ENV LANG=C.UTF-8
-RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.6/main' > /etc/apk/repositories && \
-	echo 'http://dl-cdn.alpinelinux.org/alpine/v3.6/community' >> /etc/apk/repositories && \
-		apk --no-cache add cmocka cppcheck cmake python3 gcc make ${CC}
-RUN apk add --no-cache musl-dev cmocka-dev
-RUN pip3 install testgres
+ENV LANG=C.UTF-8 PGDATA=/pg/data
+RUN apk --no-cache add python3 gcc make musl-dev ${CC}
 
-ENV PGDATA=/pg/data
-RUN mkdir -p /pg/data && \
+RUN if ${CHECK_CODE} -eq "true" && ${CC} -eq "gcc"; then \
+	echo 'http://dl-cdn.alpinelinux.org/alpine/v3.6/main' > /etc/apk/repositories && \
+	echo 'http://dl-cdn.alpinelinux.org/alpine/v3.6/community' >> /etc/apk/repositories && \
+	apk --no-cache add cppcheck; \
+	fi && \
+	pip3 install testgres && \
+	mkdir -p /pg/data && \
 	mkdir /pg/pg_pathman && \
 	chown postgres:postgres ${PGDATA} && \
 	chmod a+rwx /usr/local/lib/postgresql && \
@@ -18,4 +19,4 @@ ADD . /pg/pg_pathman
 WORKDIR /pg/pg_pathman
 RUN chmod -R go+rwX /pg/pg_pathman
 USER postgres
-RUN PGDATA=${PGDATA} CC=${CC} CHECK_CODE=${CHECK_CODE} bash run_tests.sh
+ENTRYPOINT PGDATA=${PGDATA} CC=${CC} CHECK_CODE=${CHECK_CODE} bash run_tests.sh

docker-compose.yml

@@ -0,0 +1,2 @@
+tests:
+    build: .

run_tests.sh

@@ -0,0 +1,75 @@
+#!/bin/bash
+
+set -eux
+
+id
+
+# perform code analysis if necessary
+if [ $CHECK_CODE = "true" ]; then
+
+	if [ "$CC" = "clang" ]; then
+		scan-build --status-bugs make USE_PGXS=1 || status=$?
+		exit $status
+
+	elif [ "$CC" = "gcc" ]; then
+		cppcheck --template "{file} ({line}): {severity} ({id}): {message}" \
+			--enable=warning,portability,performance \
+			--suppress=redundantAssignment \
+			--suppress=uselessAssignmentPtrArg \
+			--suppress=incorrectStringBooleanError \
+			--std=c89 src/*.c src/*.h 2> cppcheck.log
+
+		if [ -s cppcheck.log ]; then
+			cat cppcheck.log
+			status=1 # error
+		fi
+
+		exit $status
+	fi
+
+	# don't forget to "make clean"
+	make USE_PGXS=1 clean
+fi
+
+# initialize database
+initdb
+
+# build pg_pathman (using CFLAGS_SL for gcov)
+make USE_PGXS=1 CFLAGS_SL="$(pg_config --cflags_sl) -coverage"
+make USE_PGXS=1 install
+
+# check build
+status=$?
+if [ $status -ne 0 ]; then exit $status; fi
+
+# add pg_pathman to shared_preload_libraries and restart cluster 'test'
+echo "shared_preload_libraries = 'pg_pathman'" >> $PGDATA/postgresql.conf
+echo "port = 55435" >> $PGDATA/postgresql.conf
+pg_ctl start -l /tmp/postgres.log -w
+
+# run regression tests
+PGPORT=55435 make USE_PGXS=1 installcheck || status=$?
+
+# show diff if it exists
+if test -f regression.diffs; then cat regression.diffs; fi
+
+set +u
+
+# run python tests
+make USE_PGXS=1 python_tests || status=$?
+if [ $status -ne 0 ]; then exit $status; fi
+
+set -u
+
+# run mock tests (using CFLAGS_SL for gcov)
+make USE_PGXS=1 PG_CPPFLAGS="-coverage" cmocka_tests || status=$?
+if [ $status -ne 0 ]; then exit $status; fi
+
+# 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
+
+exit $status

tests/cmocka/Makefile

@@ -3,16 +3,15 @@ TOP_SRC_DIR = ../../src
 
 CC = gcc
 CFLAGS += -I $(TOP_SRC_DIR) -I $(shell $(PG_CONFIG) --includedir-server)
-CFLAGS += -I$(CURDIR)/../../src/include
+CFLAGS += -I$(CURDIR)/../../src/include -I.
 CFLAGS += $(shell $(PG_CONFIG) --cflags_sl)
 CFLAGS += $(shell $(PG_CONFIG) --cflags)
 CFLAGS += $(CFLAGS_SL)
 CFLAGS += $(PG_CPPFLAGS)
-LDFLAGS = -lcmocka
 TEST_BIN = rangeset_tests
 
 OBJ = missing_basic.o missing_list.o missing_stringinfo.o \
-	  missing_bitmapset.o rangeset_tests.o \
+	  missing_bitmapset.o rangeset_tests.o cmockery.o \
 	  $(TOP_SRC_DIR)/rangeset.o