-
-
Notifications
You must be signed in to change notification settings - Fork 6.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
test1165: verify that CURL_DISABLE_ symbols are in sync
between configure.ac and source code. They should be possible to switch on/off in configure AND be used in source code.
- Loading branch information
Showing
3 changed files
with
123 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,25 @@ | |||
<testcase> | |||
<info> | |||
<keywords> | |||
source analysis | |||
CURL_DISABLE | |||
</keywords> | |||
</info> | |||
|
|||
# | |||
# Client-side | |||
<client> | |||
<server> | |||
none | |||
</server> | |||
|
|||
<name> | |||
Verify configure.ac and source code CURL_DISABLE_-sync | |||
</name> | |||
|
|||
<command type="perl"> | |||
%SRCDIR/disable-scan.pl %SRCDIR/.. | |||
</command> | |||
</client> | |||
|
|||
</testcase> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,97 @@ | |||
#!/usr/bin/env perl | |||
#*************************************************************************** | |||
# _ _ ____ _ | |||
# Project ___| | | | _ \| | | |||
# / __| | | | |_) | | | |||
# | (__| |_| | _ <| |___ | |||
# \___|\___/|_| \_\_____| | |||
# | |||
# Copyright (C) 2010-2019, Daniel Stenberg, <daniel@haxx.se>, et al. | |||
# | |||
# This software is licensed as described in the file COPYING, which | |||
# you should have received as part of this distribution. The terms | |||
# are also available at https://curl.haxx.se/docs/copyright.html. | |||
# | |||
# You may opt to use, copy, modify, merge, publish, distribute and/or sell | |||
# copies of the Software, and permit persons to whom the Software is | |||
# furnished to do so, under the terms of the COPYING file. | |||
# | |||
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | |||
# KIND, either express or implied. | |||
# | |||
########################################################################### | |||
# | |||
|
|||
use strict; | |||
use warnings; | |||
|
|||
# the DISABLE options that can be set by configure | |||
my %disable; | |||
# the DISABLE options that are used in C files | |||
my %file; | |||
|
|||
# we may get the dir root pointed out | |||
my $root=$ARGV[0] || "."; | |||
|
|||
sub scan_configure { | |||
open S, "<$root/configure.ac"; | |||
while(<S>) { | |||
if(/(CURL_DISABLE_[A-Z_]+)/g) { | |||
my ($sym)=($1); | |||
$disable{$sym} = 1; | |||
} | |||
} | |||
close S; | |||
} | |||
|
|||
sub scan_file { | |||
my ($source)=@_; | |||
open F, "<$source"; | |||
while(<F>) { | |||
if(/(CURL_DISABLE_[A-Z_]+)/g) { | |||
my ($sym)=($1); | |||
$file{$sym} = $source; | |||
} | |||
} | |||
close F; | |||
} | |||
|
|||
sub scan_dir { | |||
my ($dir)=@_; | |||
opendir(my $dh, $dir) || die "Can't opendir $dir: $!"; | |||
my @cfiles = grep { /\.c\z/ && -f "$dir/$_" } readdir($dh); | |||
closedir $dh; | |||
for my $f (sort @cfiles) { | |||
scan_file("$dir/$f"); | |||
} | |||
} | |||
|
|||
sub scan_sources { | |||
scan_dir("$root/src"); | |||
scan_dir("$root/lib"); | |||
scan_dir("$root/lib/vtls"); | |||
scan_dir("$root/lib/vauth"); | |||
} | |||
|
|||
scan_configure(); | |||
scan_sources(); | |||
|
|||
|
|||
my $error = 0; | |||
# Check the configure symbols for use in code | |||
for my $s (sort keys %disable) { | |||
if(!$file{$s}) { | |||
printf "Present in configure.ac, not used by code: %s\n", $s; | |||
$error++; | |||
} | |||
} | |||
|
|||
# Check the code symbols for use in configure | |||
for my $s (sort keys %file) { | |||
if(!$disable{$s}) { | |||
printf "Not set by configure: %s (%s)\n", $s, $file{$s}; | |||
$error++; | |||
} | |||
} | |||
|
|||
exit $error; |
29177f4
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@bagder Does disable-scan.pl need some special handling? My autobuilds using the daily snapshots are failing with 'Can't open perl script "/curl-7.65.2-20190612/tests/disable-scan.pl": No such file or directory':
https://curl.haxx.se/dev/log.cgi?id=20190612042108-28894#prob1
https://curl.haxx.se/dev/log.cgi?id=20190612044936-4963#prob1