Change travis configuration

Author: ildus

.travis.yml

@@ -17,15 +17,15 @@ script:
     - docker-compose run tests
 
 env:
-    - PG_VERSION=10  CHECK_CODE=true COMPILER=clang
-    - PG_VERSION=9.6 CHECK_CODE=true COMPILER=clang
-    - PG_VERSION=9.5 CHECK_CODE=true COMPILER=clang
-    - PG_VERSION=10  CHECK_CODE=true COMPILER=gcc
-    - PG_VERSION=10  CHECK_CODE=false COMPILER=gcc
-    - PG_VERSION=9.6 CHECK_CODE=true COMPILER=gcc
-    - PG_VERSION=9.6 CHECK_CODE=false COMPILER=gcc
-    - PG_VERSION=9.5 CHECK_CODE=true COMPILER=gcc
-    - PG_VERSION=9.5 CHECK_CODE=false COMPILER=gcc
+    - PG_VERSION=10  CHECK_CODE=clang
+    - PG_VERSION=9.6 CHECK_CODE=clang
+    - PG_VERSION=9.5 CHECK_CODE=clang
+    - PG_VERSION=10  CHECK_CODE=cppcheck
+    - PG_VERSION=10  CHECK_CODE=false
+    - PG_VERSION=9.6 CHECK_CODE=cppcheck
+    - PG_VERSION=9.6 CHECK_CODE=false
+    - PG_VERSION=9.5 CHECK_CODE=cppcheck
+    - PG_VERSION=9.5 CHECK_CODE=false
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

Dockerfile.tmpl

@@ -4,7 +4,8 @@ ENV LANG=C.UTF-8 PGDATA=/pg/data
 
 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 python3 gcc make musl-dev cppcheck ${COMPILER} && \
+	apk --no-cache add python3 gcc make musl-dev cppcheck && \
+	apk --no-cache add clang-analyzer --repository http://dl-3.alpinelinux.org/alpine/edge/main/ && \
 	pip3 install testgres && \
 	mkdir -p /pg/data && \
 	mkdir /pg/pg_pathman && \
@@ -16,4 +17,4 @@ ADD . /pg/pg_pathman
 WORKDIR /pg/pg_pathman
 RUN chmod -R go+rwX /pg/pg_pathman
 USER postgres
-ENTRYPOINT PGDATA=${PGDATA} COMPILER=${COMPILER} CHECK_CODE=${CHECK_CODE} bash run_tests.sh
+ENTRYPOINT PGDATA=${PGDATA} CHECK_CODE=${CHECK_CODE} bash run_tests.sh

run_tests.sh

@@ -2,37 +2,33 @@
 
 set -eux
 
-echo COMPILER=$COMPILER
 echo CHECK_CODE=$CHECK_CODE
 echo PG_VERSION=$PG_VERSION
 
 # perform code analysis if necessary
-if [ $CHECK_CODE = "true" ]; then
-
-	if [ "$COMPILER" = "clang" ]; then
-		scan-build --status-bugs make USE_PGXS=1 || status=$?
-		exit $status
-
-	elif [ "$COMPILER" = "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
+if [ "$CHECK_CODE" = "clang" ]; then
+    scan-build --status-bugs make USE_PGXS=1 || status=$?
+    exit $status
+
+elif [ "$CHECK_CODE" = "cppcheck" ]; then
+    cppcheck --template "{file} ({line}): {severity} ({id}): {message}" \
+        --enable=warning,portability,performance \
+        --suppress=redundantAssignment \
+        --suppress=uselessAssignmentPtrArg \
+        --suppress=incorrectStringBooleanError \
+        --std=c89 src/*.c src/include/*.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
+
 # initialize database
 initdb