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

diff --git a/src/cf_gen.cc b/src/cf_gen.cc
index c3da2d74344c76153078550da24c2a068629ba29..0c78fa77629daf65d64d91095ff7cc71e84ba514 100644 (file)
--- a/src/cf_gen.cc
+++ b/src/cf_gen.cc
@@ -473,6 +473,8 @@ main(int argc, char *argv[])
             " * Abstract: This file contains routines used to configure the\n"
             " *           variables in the squid server.\n"
             " */\n"
+            "\n"
+            "#include \"config.h\"\n"
             "\n",
             input_filename, argv[0]
            );

diff --git a/src/cf_gen_defines b/src/cf_gen_defines
index 837f58bdbe25d64bf6758aaa951b8936a307ace2..c241b5ab7c5800693e91f8fde5dcd6e7ab5d7280 100644 (file)
--- 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 49c25add78b64b3782b3767f632e4476decbbc80..973c2160004a986d0f294b5844c22d9e82393e94 100755 (executable)
--- 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; } "