Skip to content

Commit 3f31fe7

Browse files
committed
added extra validation to make sure that -show count is CORRECT before issuing a PASS
1 parent 51862ac commit 3f31fe7

File tree

2 files changed

+143
-132
lines changed

2 files changed

+143
-132
lines changed

jtrts.pl

+13-2
Original file line numberDiff line numberDiff line change
@@ -700,8 +700,19 @@ sub process {
700700
exit(1);
701701
}
702702
} elsif ($ret_val == 0) {
703-
my $str = sprintf("form=%-28.28s guesses: %4.4s $crack_xx[3] $crack_xx[4] [PASSED]\n", $ar[4], $orig_crack_cnt);
704-
ScreenOutSemi($str);
703+
if ($orig_crack_cnt != $orig_show_cnt) {
704+
if (index($ar[10], "(-show$orig_show_cnt)") >= 0) {
705+
# we are 'ok' here.
706+
my $str = sprintf("form=%-28.28s guesses: %4.4s $crack_xx[3] $crack_xx[4] [PASSED]\n", $ar[4], $orig_crack_cnt);
707+
ScreenOutSemi($str);
708+
} else {
709+
my $str = sprintf("form=%-28.28s guesses: %4.4s -show=%-4.4s $crack_xx[3] $crack_xx[4] : Expected count(s) $ar[10] [!!!FAILED!!!]\n", $ar[4], $orig_crack_cnt, $orig_show_cnt);
710+
ScreenOutAlways($str);
711+
}
712+
} else {
713+
my $str = sprintf("form=%-28.28s guesses: %4.4s $crack_xx[3] $crack_xx[4] [PASSED]\n", $ar[4], $orig_crack_cnt);
714+
ScreenOutSemi($str);
715+
}
705716
} else {
706717
my $str = sprintf("form=%-28.28s guesses: %4.4s $crack_xx[3] $crack_xx[4] [pass, but return code $ret_val]\n", $ar[4], $orig_crack_cnt);
707718
ScreenOutAlways($str);

0 commit comments

Comments
 (0)