From: Jim Cromie Date: Mon, 2 Aug 2004 09:15:23 +0000 (-0600) Subject: additional -V:foo tests X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=307dc11379fefa6850036a968c505ca34e0fccb8;p=p5sagit%2Fp5-mst-13.2.git additional -V:foo tests Message-ID: <410E5A8B.9030307@divsol.com> p4raw-id: //depot/perl@23185 --- diff --git a/configpm b/configpm index e5f2c08..edd0844 100755 --- a/configpm +++ b/configpm @@ -368,11 +368,15 @@ sub config_re { } sub config_vars { + # implements -V:cfgvar option (see perlrun -V:) foreach (@_) { + # find optional leading, trailing colons; and query-spec my ($notag,$qry,$lncont) = m/^(:)?(.*?)(:)?$/; # flags fore and aft, - my $prfx = $notag ? '': "$qry="; # prefix for print - my $lnend = $lncont ? ' ' : ";\n"; # ending for print + # map colon-flags to print decorations + my $prfx = $notag ? '': "$qry="; # tag-prefix for print + my $lnend = $lncont ? ' ' : ";\n"; # line ending for print + # all config-vars are by definition \w only, any \W means regex if ($qry =~ /\W/) { my @matches = config_re($qry); print map "$_$lnend", @matches ? @matches : "$qry: not found" if !$notag; diff --git a/lib/Config.t b/lib/Config.t index 38acde6..3ed110a 100644 --- a/lib/Config.t +++ b/lib/Config.t @@ -72,49 +72,90 @@ foreach my $line (Config::config_re('c.*')) { my $out = tie *STDOUT, 'FakeOut'; -Config::config_vars('cc'); +Config::config_vars('cc'); # non-regex test of essential cfg-var my $out1 = $$out; $out->clear; -Config::config_vars('d_bork'); +Config::config_vars('d_bork'); # non-regex, non-existent cfg-var my $out2 = $$out; $out->clear; -Config::config_vars('PERL_API_.*'); +Config::config_vars('PERL_API_.*'); # regex, tagged multi-line answer my $out3 = $$out; $out->clear; -Config::config_vars(':PERL_API_.*:'); +Config::config_vars('PERL_API_.*:'); # regex, tagged single-line answer my $out4 = $$out; $out->clear; -Config::config_vars(':PERL_API_REVISION:'); +Config::config_vars(':PERL_API_.*:'); # regex, non-tagged single-line answer my $out5 = $$out; $out->clear; -Config::config_vars('?flags'); +Config::config_vars(':PERL_API_.*'); # regex, non-tagged multi-line answer my $out6 = $$out; $out->clear; +Config::config_vars('PERL_API_REVISION.*:'); # regex, tagged +my $out7 = $$out; +$out->clear; + +Config::config_vars(':PERL_API_REVISION.*'); # regex, non-tagged multi-line answer +my $out8 = $$out; +$out->clear; + +Config::config_vars('PERL_EXPENSIVE_.*:'); # non-matching regex +my $out9 = $$out; +$out->clear; + +Config::config_vars('?flags'); # bogus regex, no explicit warning ! +my $out10 = $$out; +$out->clear; + untie *STDOUT; -like($out1, qr/^cc='\Q$Config{cc}\E';/, "config_vars cc"); -like($out2, qr/^d_bork='UNKNOWN';/, "config_vars d_bork is UNKNOWN"); - -is(3, scalar split(/\n/, $out3), "3 PERL_API vars found"); -my @api = $out3 =~ /^PERL_API_(\w+)=(.*);/mg; -is("'5'", $api[1], "1st is 5"); -is("'9'", $api[5], "2nd is 9"); -is("'1'", $api[3], "3rd is 1"); -@api = split(/ /, $out4); -is(3, @api, "trailing colon puts 3 terms on same line"); -unlike($out4, qr/=/, "leading colon suppresses param names"); -is("'5'", $api[0], "revision is 5"); -is("'9'", $api[2], "version is 9"); -is("'1'", $api[1], "subversion is 1"); - -is("'5' ", $out5, "leading and trailing colons return just the value"); - -like($out6, qr/\bnot\s+found\b/, "config_vars with invalid regexp"); + +like($out1, qr/^cc='\Q$Config{cc}\E';/, "found config_var cc"); +like($out2, qr/^d_bork='UNKNOWN';/, "config_var d_bork is UNKNOWN"); + +# test for leading, trailing colon effects +is(scalar split(/;\n/, $out3), 3, "3 lines found"); +is(scalar split(/;\n/, $out6), 3, "3 lines found"); + +is($out4 =~ /(;\n)/s, '', "trailing colon gives 1-line response: $out4"); +is($out5 =~ /(;\n)/s, '', "trailing colon gives 1-line response: $out5"); + +is(scalar split(/=/, $out3), 4, "found 'tag='"); +is(scalar split(/=/, $out4), 4, "found 'tag='"); + +my @api; + +my @rev = @Config{qw(PERL_API_REVISION PERL_API_VERSION PERL_API_SUBVERSION)}; + +print ("# test tagged responses, multi-line and single-line\n"); +foreach $api ($out3, $out4) { + @api = $api =~ /PERL_API_(\w+)=(.*?)(?:;\n|\s)/mg; + is($api[0], "REVISION", "REVISION tag"); + is($api[4], "VERSION", "VERSION tag"); + is($api[2], "SUBVERSION", "SUBVERSION tag"); + is($api[1], "'$rev[0]'", "REVISION is $rev[0]"); + is($api[5], "'$rev[1]'", "VERSION is $rev[1]"); + is($api[3], "'$rev[2]'", "SUBVERSION is $rev[2]"); +} + +print("# test non-tagged responses, multi-line and single-line\n"); +foreach $api ($out5, $out6) { + @api = split /(?: |;\n)/, $api; + is($api[0], "'$rev[0]'", "revision is $rev[0]"); + is($api[2], "'$rev[1]'", "version is $rev[1]"); + is($api[1], "'$rev[2]'", "subversion is $rev[2]"); +} + +# compare to each other, the outputs for trailing, leading colon +$out7 =~ s/ $//; +is("$out7;\n", "PERL_API_REVISION=$out8", "got expected diffs"); + +like($out9, qr/\bnot\s+found\b/, "$out9 - perl is FREE !"); +like($out10, qr/\bnot\s+found\b/, "config_vars with invalid regexp"); # Read-only. diff --git a/pod/perlrun.pod b/pod/perlrun.pod index e99729e..3feab02 100644 --- a/pod/perlrun.pod +++ b/pod/perlrun.pod @@ -834,12 +834,14 @@ prints the version and patchlevel of your perl executable. prints summary of the major perl configuration values and the current values of @INC. -=item B<-V:>I +=item B<-V:>I Prints to STDOUT the value of the named configuration variable(s), -with multiples when your query looks like a regex. -For example, +with multiples when your configvar argument looks like a regex (has +non-letters). For example: + $ perl -V:libc + libc='/lib/libc-2.2.4.so'; $ perl -V:lib. libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'; libc='/lib/libc-2.2.4.so'; @@ -860,7 +862,7 @@ you to embed queries into shell commands. (mnemonic: PATH separator compression-vars: zcat='' zip='zip' are here ! A leading colon removes the 'name=' part of the response, this allows -you to map to the name you need. +you to map to the name you need. (mnemonic: empty label) $ echo "goodvfork="`./perl -Ilib -V::usevfork` goodvfork=false;