From 1bb05ac16f0c2df768061d8c32d5ae827acd2946 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Fri, 19 Nov 2010 15:54:21 -0800 Subject: [PATCH] Check for errors while preprocessing curl.h in test 1119 This showed a problem when running the test out-of-tree, so an include path is now being added to pick up the generated curlbuild.h file. --- tests/data/test1119 | 2 +- tests/symbol-scan.pl | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/data/test1119 b/tests/data/test1119 index 52b7e5893..4b5a9ec73 100644 --- a/tests/data/test1119 +++ b/tests/data/test1119 @@ -17,7 +17,7 @@ Verify that symbols-in-versions and headers are in sync -%SRCDIR/symbol-scan.pl %SRCDIR/.. +%SRCDIR/symbol-scan.pl %SRCDIR/.. ../include/curl diff --git a/tests/symbol-scan.pl b/tests/symbol-scan.pl index f12660339..dea1f73b8 100644 --- a/tests/symbol-scan.pl +++ b/tests/symbol-scan.pl @@ -28,6 +28,10 @@ # we may get the dir root pointed out my $root=$ARGV[0] || "."; +# need an include directory when building out-of-tree +my $i=$ARGV[1]; +$i="-I$i " if $i; + my $h = "$root/include/curl/curl.h"; my $mh = "$root/include/curl/multi.h"; @@ -35,7 +39,7 @@ my $verbose=0; my $summary=0; my $misses=0; -open H_IN, "-|", "cpp " . $h; +open H_IN, "-|", "cpp $i$h" || die "Cannot preprocess curl.h"; while ( ) { if ( /enum\s+(\S+\s+)?{/ .. /}/ ) { s/^\s+//; @@ -45,7 +49,8 @@ while ( ) { push @syms, $_; } } -close H_IN; +close H_IN || die "Error preprocessing curl.h"; + sub scanheader { my ($f)=@_; open H, "<$f";