Skip to content
Permalink
Browse files

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...
bagder committed Jun 11, 2019
1 parent 002cdc9 commit 29177f422a55310976378440ffb00ee7d19ce6e9
Showing with 123 additions and 2 deletions.
  1. +1 −2 tests/data/Makefile.inc
  2. +25 −0 tests/data/test1165
  3. +97 −0 tests/disable-scan.pl
@@ -128,8 +128,7 @@ test1128 test1129 test1130 test1131 test1132 test1133 test1134 test1135 \
test1136 test1137 test1138 test1139 test1140 test1141 test1142 test1143 \
test1144 test1145 test1146 test1147 test1148 test1149 test1150 test1151 \
test1152 test1153 test1154 test1155 test1156 test1157 test1158 test1159 \
\
test1160 test1161 test1162 test1163 test1164 \
test1160 test1161 test1162 test1163 test1164 test1165 \
test1170 test1171 test1172 \
\
test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \
@@ -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>
@@ -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;

1 comment on commit 29177f4

@MarcelRaad

This comment has been minimized.

Copy link
Member

commented on 29177f4 Jun 12, 2019

@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

Please sign in to comment.
You can’t perform that action at this time.