From c69c6d0848790a3d2e8a98b29b64a7b04fe1905b Mon Sep 17 00:00:00 2001
From: clanmills <robin@clanmills.com>
Date: Fri, 8 May 2020 08:23:17 +0100
Subject: [PATCH] tidy up ci and test scripts

---
 ci/run.sh             | 18 +++++-------------
 test/functions.source |  4 ++--
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/ci/run.sh b/ci/run.sh
index d358fe0f..d3000dba 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -6,7 +6,6 @@ set -x
 source conan/bin/activate
 
 if [[ "$(uname -s)" == 'Linux' ]]; then
-
     if [ "$CC" == "clang" ]; then
         # clang + Ubuntu don't like to run with UBSAN, but ASAN works
         export CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_CXX_FLAGS=\"-fsanitize=address\" -DCMAKE_C_FLAGS=\"-fsanitize=address\" -DCMAKE_EXE_LINKER_FLAGS=\"-fsanitize=address\" -DCMAKE_MODULE_LINKER_FLAGS=\"-fsanitize=address\""
@@ -19,15 +18,13 @@ else
     export CMAKE_OPTIONS="$CMAKE_OPTIONS -DEXIV2_TEAM_USE_SANITIZERS=ON"
 fi
 
-
-mkdir build && cd build
+mkdir build
+cd    build
 conan install .. -o webready=True --build missing
-
 cmake ${CMAKE_OPTIONS} -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DCMAKE_INSTALL_PREFIX=install ..
-make -j2
-
-make tests
-make install
+make
+make  tests
+make  install
 
 # Check for detecting issues with the installation of headers
 if [ `ls install/include/exiv2/ | wc -l` > 10 ]; then
@@ -37,11 +34,6 @@ else
     exit 1
 fi
 
-pushd .
-cd bin
-$EXIV2_VALGRIND ./unit_tests
-popd
-
 if [ -n "$COVERAGE" ]; then
     bash <(curl -s https://codecov.io/bash)
 fi
diff --git a/test/functions.source b/test/functions.source
index 0f1f993e..949394c8 100644
--- a/test/functions.source
+++ b/test/functions.source
@@ -495,7 +495,7 @@ prepareTest()
 	good="$here/data/${this}.out"
 	results="$here/tmp/${this}.out"
 	tmpfile=$here/tmp/$this
-	touch $tmpfile
+	echo '' >> $tmpfile
 
 	if [ "$PLATFORM" == SunOS -o "$PLATFORM" == FreeBSD -o "$PLATFORM" == NetBSD ] ; then
 	    da1=""
@@ -508,7 +508,7 @@ prepareTest()
 		fi
 
 		tmpfile=tmp/ttt
-		touch $tmpfile
+		echo '' >> $tmpfile
 		da1="--strip-trailing-cr"
 		diff -q $da1 $tmpfile $tmpfile 2>/dev/null
 		if [ $? -ne 0 ] ; then