Change variable name

Author: ildus

.travis.yml

@@ -10,22 +10,22 @@ services:
     - docker
 
 install:
-    - sed -e 's/${CHECK_CODE}/'${CHECK_CODE}/g -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/${COMPILER}/'${COMPILER}/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=9.6 CHECK_CODE=true CC=clang
-    - PG_VERSION=9.5 CHECK_CODE=true 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
-    - PG_VERSION=9.6 CHECK_CODE=false CC=gcc
-    - PG_VERSION=9.5 CHECK_CODE=true CC=gcc
-    - PG_VERSION=9.5 CHECK_CODE=false CC=gcc
+    - 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
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

Dockerfile.tmpl

@@ -4,7 +4,7 @@ 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 ${CC} && \
+	apk --no-cache add python3 gcc make musl-dev cppcheck ${COMPILER} && \
 	pip3 install testgres && \
 	mkdir -p /pg/data && \
 	mkdir /pg/pg_pathman && \
@@ -16,4 +16,4 @@ ADD . /pg/pg_pathman
 WORKDIR /pg/pg_pathman
 RUN chmod -R go+rwX /pg/pg_pathman
 USER postgres
-ENTRYPOINT PGDATA=${PGDATA} CC=${CC} CHECK_CODE=${CHECK_CODE} bash run_tests.sh
+ENTRYPOINT PGDATA=${PGDATA} COMPILER=${COMPILER} CHECK_CODE=${CHECK_CODE} bash run_tests.sh

run_tests.sh

@@ -3,17 +3,18 @@
 set -eux
 
 echo CC=$CC
+echo COMPILER=$COMPILER
 echo CHECK_CODE=$CHECK_CODE
 echo PG_VERSION=$PG_VERSION
 
 # perform code analysis if necessary
 if [ $CHECK_CODE = "true" ]; then
 
-	if [ "$CC" = "clang" ]; then
+	if [ "$COMPILER" = "clang" ]; then
 		scan-build --status-bugs make USE_PGXS=1 || status=$?
 		exit $status
 
-	elif [ "$CC" = "gcc" ]; then
+	elif [ "$COMPILER" = "gcc" ]; then
 		cppcheck --template "{file} ({line}): {severity} ({id}): {message}" \
 			--enable=warning,portability,performance \
 			--suppress=redundantAssignment \