From 3d6861406fa0fb5ecd5f61bd7389c873e6eea810 Mon Sep 17 00:00:00 2001
From: Masatake YAMATO <yamato@redhat.com>
Date: Sun, 10 Mar 2019 19:24:12 +0900
Subject: [PATCH 1/2] units: don't use -r option with -a option of cp command

-a implies -r. This redundancy causes an error on MacOSX.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
---
 misc/units | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/units b/misc/units
index dfa07541cf..9bda0360be 100755
--- a/misc/units
+++ b/misc/units
@@ -430,7 +430,7 @@ prepare_bundles ()
 		;;
 	    *)
 		dist="${to}/$(basename ${src})"
-		if ! cp -ar "${src}" "${to}"; then
+		if ! cp -a "${src}" "${to}"; then
 		    ERROR 1 "failure in copying bundle file \"${src}\" to \"${to}\""
 		else
 		    echo ${dist} >> ${obundles}

From b9f11b47e74ebbf4f46ac1db824e5242134c1d36 Mon Sep 17 00:00:00 2001
From: Masatake YAMATO <yamato@redhat.com>
Date: Wed, 6 Mar 2019 02:16:47 +0900
Subject: [PATCH 2/2] travis-ci: do out-of-tree build

---
 .travis.yml          |  2 +-
 misc/travis-check.sh | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dedf6abd96..15f96e5ce6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,7 +64,7 @@ after_success:
                     sed -i -e 's/severity.capitalize!/severity = severity.capitalize/' $f
             done
         ) || :
-        lcov -c -b . -d . -o coverage.info && lcoveralls --root . --retry-count 5 coverage.info
+        (cd linux-gcc-gcov; lcov -c -b . -d . -o coverage.info && lcoveralls --root . --retry-count 5 coverage.info)
     fi
 
 # Build Matrix configuration
diff --git a/misc/travis-check.sh b/misc/travis-check.sh
index 276461be85..cb52df08a1 100755
--- a/misc/travis-check.sh
+++ b/misc/travis-check.sh
@@ -25,31 +25,47 @@ SANDBOX_CASES=sandbox,sandbox-crash,sandbox-default-req,sandbox-unknown-submode
 if [ "$TARGET" = "Unix" ]; then
 
 	./autogen.sh
-	CONFIGURE_CMDLINE="./configure --enable-debugging --enable-iconv "
+	CONFIGURE_CMDLINE="../configure --enable-debugging --enable-iconv "
 
+	BUILDDIR0="$TRAVIS_OS_NAME"-"$CC"
     if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CC" = "gcc" ]; then
 
+		BUILDDIR=${BUILDDIR0}
+		mkdir -p ${BUILDDIR}
+		(
+		cd ${BUILDDIR}
         ${CONFIGURE_CMDLINE}
         make -j2
         echo 'Run "make tmain (sandbox only)" without gcov'
         make -j2 tmain TRAVIS=1 UNITS=${SANDBOX_CASES}
 
         make clean
+		)
 
+		BUILDDIR=${BUILDDIR0}-gcov
+		mkdir -p ${BUILDDIR}
+		(
+		cd ${BUILDDIR}
 		${CONFIGURE_CMDLINE} --enable-coverage-gcov
         make -j2 COVERAGE=1
         echo 'List features'
         ./ctags --list-features
         echo 'Run "make check" with gcov'
         make -j2 check roundtrip TRAVIS=1
+		)
 
     else
+		BUILDDIR=${BUILDDIR0}
+		mkdir -p ${BUILDDIR}
+		(
+		cd ${BUILDDIR}
 		${CONFIGURE_CMDLINE}
         make -j2
         echo 'List features'
         ./ctags --list-features
         echo 'Run "make check" (without gcov)'
         make -j2 check roundtrip TRAVIS=1
+		)
     fi
 elif [ "$TARGET" = "Mingw32" ]; then
     make -j2 CC=i686-w64-mingw32-gcc CC_FOR_PACKCC=gcc -f mk_mingw.mak