From cccb5094a4090f92b4b3dab429a577405971eef8 Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 28 Nov 2018 13:34:31 +0000
Subject: [PATCH] - Fix clang analysis for outside directory build test.

git-svn-id: file:///svn/unbound/trunk@4990 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 doc/Changelog                                    | 1 +
 testdata/clang-analysis.tdir/clang-analysis.test | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index dee5d58bc..8ec5f5bb2 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 28 November 2018: Wouter
 	- Fix leak in chroot fix for auth-zone.
+	- Fix clang analysis for outside directory build test.
 
 27 November 2018: Wouter
 	- Fix DNS64 to not store intermediate results in cache, this avoids
diff --git a/testdata/clang-analysis.tdir/clang-analysis.test b/testdata/clang-analysis.tdir/clang-analysis.test
index fc5f000a5..d8585d62d 100644
--- a/testdata/clang-analysis.tdir/clang-analysis.test
+++ b/testdata/clang-analysis.tdir/clang-analysis.test
@@ -50,7 +50,9 @@ compatfiles=`echo "$LIBOBJS" | sed -e 's?..LIBOBJDIR.?compat/?g' -e 's/.U.o/.c/g
 if test "$WITH_PYTHONMODULE" = "yes"; then PYTHONMOD_SRC="pythonmod/*.c"; fi
 if test ! -z "$WINAPPS"; then WIN_SRC="winrc/*.c"; fi
 
-cd $PRE; cd $srcdir
+cd $PRE;
+odir=`pwd`
+cd $srcdir
 # check the files in the srcdir
 fail="no"
 for x in cachedb/*.c daemon/*.c dns64/*.c $DNSCRYPT_SRC $DNSTAP_SRC edns-subnet/*.c ipsecmod/*.c iterator/*.c libunbound/*.c $PYTHONMOD_SRC respip/*.c services/*.c services/*/*.c sldns/*.c smallapp/*.c util/*.c util/*/*.c validator/*.c $WIN_SRC $compatfiles testcode/*.c; do
@@ -60,7 +62,8 @@ for x in cachedb/*.c daemon/*.c dns64/*.c $DNSCRYPT_SRC $DNSTAP_SRC edns-subnet/
 	echo clang --analyze $CPPFLAGS $x
 	plist=`basename $x .c`.plist
 	rm -rf $plist
-	clang --analyze $CPPFLAGS $x 2>&1 | tee tmp.$$
+	#echo "(cd $odir; clang --analyze $CPPFLAGS $srcdir/$x 2>&1 ) | tee tmp.$$"
+	(cd "$odir"; clang --analyze $CPPFLAGS $srcdir/$x 2>&1 ) | tee tmp.$$
 	if grep -e warning -e error tmp.$$ >/dev/null; then
 		fail="yes"
 		fails="$fails $x"
-- 
2.47.3