Refactoring.

Author: jblueh

.gitlab-ci.yml

@@ -50,5 +50,5 @@ test-output:
     - cd tests
     - export CXX=g++
     - export OUTPUT_INSTRUMENT=yes
-    - export ERROR_OUTPUT_IS_ERROR=no
+    - export STDERR_OUTPUT_IS_ERROR=no
     - make all

tests/Makefile

@@ -43,7 +43,7 @@ OUTPUT_INSTRUMENT ?= no
 EXPLICIT_PREPROCESSOR ?= no
 
 # possibly set in the environment, toggle whether nonempty output on stderr is treated as an error
-ERROR_OUTPUT_IS_ERROR ?= yes
+STDERR_OUTPUT_IS_ERROR ?= yes
 
 CXX ?= clang++
 
@@ -154,7 +154,7 @@ $(patsubst %,run%,$(DRIVERS)):
 	@rm -f testresults; \
 	for test in ${DRIVER_TESTS}; \
 	do \
-		bash run.sh ${DRIVER} $$test $(MODE) $(EXPLICIT_PREPROCESSOR) $(ERROR_OUTPUT_IS_ERROR); \
+		bash run.sh ${DRIVER} $$test $(MODE) $(EXPLICIT_PREPROCESSOR) $(STDERR_OUTPUT_IS_ERROR); \
 	done; \
 	if grep -q 1 testresults; then \
 		exit 1; \

tests/run.sh

@@ -28,15 +28,15 @@ TEST=$2
 GENFILE=$BUILD_DIR"/"$DRIVER$TEST".cpp"
 MODE=$3
 EXPLICIT_PREPROCESSOR=$4
-ERROR_OUTPUT_IS_ERROR=$5
+STDERR_OUTPUT_IS_ERROR=$5
 
 LAUNCH_NAME=$DRIVER$TEST
 if [[ "$EXPLICIT_PREPROCESSOR" == "yes" ]];
 then
   LAUNCH_NAME+="Pre";
 fi
 
-if [[ "$ERROR_OUTPUT_IS_ERROR" == "yes" ]];
+if [[ "$STDERR_OUTPUT_IS_ERROR" == "yes" ]];
 then
 	ERROR_FILE=$RESULT_DIR/$DRIVER$TEST.err;
 else