add support for valgrind

Author: funbringer

mk_dockerfile.sh

@@ -1,2 +1,16 @@
-set -eu
-sed -e 's/${PG_VERSION}/'${PG_VERSION}/g -e 's/${LEVEL}/'${LEVEL}/g Dockerfile.tmpl > Dockerfile
+if [ -z ${PG_VERSION+x} ]; then
+	echo PG_VERSION is not set!
+	exit 1
+fi
+
+if [ -z ${LEVEL+x} ]; then
+	LEVEL=scan-build
+fi
+
+echo PG_VERSION=${PG_VERSION}
+echo LEVEL=${LEVEL}
+
+sed \
+	-e 's/${PG_VERSION}/'${PG_VERSION}/g \
+	-e 's/${LEVEL}/'${LEVEL}/g \
+	Dockerfile.tmpl > Dockerfile

run_tests.sh

@@ -1,15 +1,16 @@
 #!/usr/bin/env bash
 
+#
 # Copyright (c) 2018, Postgres Professional
-
-
-# provide a decent default level
-if [ -z ${LEVEL+x} ]; then
-	LEVEL=scan-build
-fi
+#
+# supported levels:
+#		* standard
+#		* scan-build
+#		* hardcore
+#		* nightmare
+#
 
 set -ux
-
 status=0
 
 
@@ -31,41 +32,41 @@ if [ "$LEVEL" = "scan-build" ]; then
 fi
 
 # build with cassert + valgrind support
-if [ "$LEVEL" = "hardcore" ]; then
+if [ "$LEVEL" = "hardcore" ] || [ "$LEVEL" = "nightmare" ]; then
 
 	set -e
 
-	CUSTOM_PG_PATH=$PWD/pg_bin
+	CUSTOM_PG_BIN=$PWD/pg_bin
+	CUSTOM_PG_SRC=$PWD/postgresql
 
 	# here PG_VERSION is provided by postgres:X-alpine docker image
 	wget -O postgresql.tar.bz2 "https://ftp.postgresql.org/pub/source/v$PG_VERSION/postgresql-$PG_VERSION.tar.bz2"
 	echo "$PG_SHA256 *postgresql.tar.bz2" | sha256sum -c -
 
-	mkdir postgresql
+	mkdir $CUSTOM_PG_SRC
 
 	tar \
 		--extract \
 		--file postgresql.tar.bz2 \
-		--directory postgresql \
+		--directory $CUSTOM_PG_SRC \
 		--strip-components 1
 
-	cd postgresql
+	cd $CUSTOM_PG_SRC
 
 	# enable Valgrind support
 	sed -i.bak "s/\/* #define USE_VALGRIND *\//#define USE_VALGRIND/g" src/include/pg_config_manual.h
 
 	# enable additional options
-	eval ./configure \
-		--with-gnu-ld \
+	./configure \
 		--enable-debug \
 		--enable-cassert \
-		--prefix=$CUSTOM_PG_PATH
+		--prefix=$CUSTOM_PG_BIN
 
-	# TODO: -j$(nproc)
-	make -s -j1 && make install
+	make -s -j$(nproc) && make -s install
 
 	# override default PostgreSQL instance
-	export PATH=$CUSTOM_PG_PATH/bin:$PATH
+	export PATH=$CUSTOM_PG_BIN/bin:$PATH
+	export LD_LIBRARY_PATH=$CUSTOM_PG_BIN/lib
 
 	# show pg_config path (just in case)
 	which pg_config
@@ -82,16 +83,43 @@ make USE_PGXS=1 install
 # initialize database
 initdb -D $PGDATA
 
+# set appropriate port
+export PGPORT=55435
+echo "port = $PGPORT" >> $PGDATA/postgresql.conf
+
 # restart cluster 'test'
-echo "port = 55435" >> $PGDATA/postgresql.conf
-pg_ctl start -l /tmp/postgres.log -w || status=$?
+if [ "$LEVEL" = "nightmare" ]; then
+	ls $CUSTOM_PG_BIN/bin
+
+	valgrind \
+		--leak-check=no \
+		--time-stamp=yes \
+		--trace-children=yes \
+		--gen-suppressions=all \
+		--suppressions=$CUSTOM_PG_SRC/src/tools/valgrind.supp \
+		--log-file=/tmp/valgrind-%p.log \
+		postgres -l /tmp/postgres.log -w || status=$?
+else
+	pg_ctl start -l /tmp/postgres.log -w || status=$?
+fi
 
 # something's wrong, exit now!
 if [ $status -ne 0 ]; then cat /tmp/postgres.log; exit 1; fi
 
 # run regression tests
 export PG_REGRESS_DIFF_OPTS="-w -U3" # for alpine's diff (BusyBox)
-PGPORT=55435 make USE_PGXS=1 installcheck || status=$?
+make USE_PGXS=1 installcheck || status=$?
+
+# show Valgrind logs if necessary
+if [ "$LEVEL" = "nightmare" ]; then
+	for f in $(find /tmp -name valgrind-*.log); do
+		if grep -q 'Command: [^ ]*/postgres' $f && grep -q 'ERROR SUMMARY: [1-9]' $f; then
+			echo "========= Contents of $f"
+			cat $f
+			status=1
+		fi
+	done
+fi
 
 # show diff if it exists
 if test -f regression.diffs; then cat regression.diffs; fi