Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15766
Modified Files:
05-KB-Option-Logics.pl
Log Message:
Correct handling of implied-by statements when the implied option comes first.
Index: 05-KB-Option-Logics.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/05-KB-Option-Logics.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** 05-KB-Option-Logics.pl 18 Apr 2007 16:29:21 -0000 1.3
--- 05-KB-Option-Logics.pl 2 Oct 2007 17:32:42 -0000 1.4
***************
*** 117,121 ****
my $ib;
foreach $ib (@ib) {
! $implied_count{$ib}++;
}
}
--- 117,121 ----
my $ib;
foreach $ib (@ib) {
! $implied_count{$ib}+=2;
}
}
***************
*** 251,258 ****
my $r = $C->analyzeOptions($opt_string);
! my $x = "1\nOption $l1 is implied by $l0\n";
! ok($r eq $x, "Analyzing $opt_string from '$i' '$ib' on " .
$C->Name() . " : expects ($x) has ($r)\n");
}
}
--- 251,266 ----
my $r = $C->analyzeOptions($opt_string);
! my $x = "Option $l1 is implied by $l0";
! $r=~s/\n/\!/g;
! ok($r =~ /$x/, "Analyzing $opt_string from '$i' '$ib' on " .
$C->Name() . " : expects ($x) has ($r)\n");
+
+ my $r2 = $C->analyzeOptions("$l1 $l0");
+ $r2=~s/\n/\!/g;
+ my $x2 = "Option $l1 is implied by $l0";
+
+ ok($r2 =~ /$x2/, "Analyzing $l1 $l0 from '$i' '$ib' on " .
+ $C->Name() . " : expects ($x2) in ($r2)\n");
}
}
|
