From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 12 Nov 2009 03:10:26 +0000 (+1300)
Subject: Make cf_gen and cache_cf .h self-complete. Remove TestBed exception
X-Git-Tag: SQUID_3_2_0_1~583
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c535dc4ee6fe274993b2b082043ed08c82e7abc9;p=thirdparty%2Fsquid.git

Make cf_gen and cache_cf .h self-complete. Remove TestBed exception
---

diff --git a/src/cf_gen_defines b/src/cf_gen_defines
index da7ad46a99..e4a96ef0cd 100644
--- a/src/cf_gen_defines
+++ b/src/cf_gen_defines
@@ -3,6 +3,7 @@ BEGIN {
 	print "/* Generated automatically from cf.data.pre"
 	print " * DO NOT EDIT"
 	print "*/"
+	print "#include \"config.h\""
 	print "static struct { const char *name; const char *enable; int defined;} defines[] = {"
 	define["DELAY_POOLS"]="--enable-delay-pools"
 	define["FOLLOW_X_FORWARDED_FOR"]="--enable-follow-x-forwarded-for"
diff --git a/test-suite/testheaders.sh b/test-suite/testheaders.sh
index 49c25add78..973c216000 100755
--- a/test-suite/testheaders.sh
+++ b/test-suite/testheaders.sh
@@ -18,13 +18,8 @@ fi
 
 for f in `cd ${dir} && ls -1 *.h 2>/dev/null`; do
 	echo -n "Testing ${dir}/${f} ..."
-	if [ "${f}" = "cf_gen_defines.h" -o "${f}" = "cf_parser.h" ]; then
-		echo " IGNORED!"
-		continue
-	fi
 	hdr=`echo "${f}" | sed s/.h//`
-	if [ ! -e ./testHeaderDeps_${hdr}.o -o ${dir}/${f} -nt ./testHeaderDeps_${hdr}.o ]
-    then
+	if [ ! -e ./testHeaderDeps_${hdr}.o -o ${dir}/${f} -nt ./testHeaderDeps_${hdr}.o ]; then
 		(	echo "/* This file is AUTOMATICALLY GENERATED. DO NOT ALTER IT */"
 			echo "#include \"${dir}/${f}\" "
 			echo "int main( int argc, char* argv[] ) { return 0; } "