89 lines
2.8 KiB
Diff
89 lines
2.8 KiB
Diff
From c5c8a2c62529d3559076caa18b424b14ee45542f Mon Sep 17 00:00:00 2001
|
|
From: Mark Nudelman <markn@greenwoodsoftware.com>
|
|
Date: Tue, 11 Oct 2022 21:16:39 -0700
|
|
Subject: [PATCH 15/48] Add -E option.
|
|
|
|
---
|
|
lesstest/lesstest.c | 7 +++++--
|
|
lesstest/runtest | 10 +++++-----
|
|
2 files changed, 10 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/lesstest/lesstest.c b/lesstest/lesstest.c
|
|
index 64578b8..a08a3a6 100644
|
|
--- a/lesstest/lesstest.c
|
|
+++ b/lesstest/lesstest.c
|
|
@@ -13,7 +13,7 @@ char* lt_screen_opts = NULL;
|
|
static char* testfile = NULL;
|
|
|
|
static int usage(void) {
|
|
- fprintf(stderr, "usage: lesstest -o file.lt [-w#] [-h#] [-edv] [-S lt_screen-opts] [--] less.exe [flags] textfile\n");
|
|
+ fprintf(stderr, "usage: lesstest -o file.lt [-w#] [-h#] [-eEdv] [-S lt_screen-opts] [--] less.exe [flags] textfile\n");
|
|
fprintf(stderr, " or: lesstest -t file.lt less.exe\n");
|
|
return 0;
|
|
}
|
|
@@ -21,7 +21,7 @@ static int usage(void) {
|
|
static int setup(int argc, char* const* argv) {
|
|
char* logfile = NULL;
|
|
int ch;
|
|
- while ((ch = getopt(argc, argv, "deo:s:S:t:v")) != -1) {
|
|
+ while ((ch = getopt(argc, argv, "deEo:s:S:t:v")) != -1) {
|
|
switch (ch) {
|
|
case 'd':
|
|
details = 1;
|
|
@@ -29,6 +29,9 @@ static int setup(int argc, char* const* argv) {
|
|
case 'e':
|
|
err_only = 1;
|
|
break;
|
|
+ case 'E':
|
|
+ err_only = 2;
|
|
+ break;
|
|
case 'o':
|
|
logfile = optarg;
|
|
break;
|
|
diff --git a/lesstest/runtest b/lesstest/runtest
|
|
index 94ff5fd..0c5fff9 100755
|
|
--- a/lesstest/runtest
|
|
+++ b/lesstest/runtest
|
|
@@ -2,7 +2,7 @@
|
|
use strict;
|
|
|
|
# Run one or more test files.
|
|
-my $usage = "usage: run [-e] [-d lesstest-dir] [-l less.exe] [-r temp-dir] [-s lt_screen] [-t lesstest] [-O lesstest-opts] [file.lt | dir]...\n";
|
|
+my $usage = "usage: run [-eE] [-d lesstest-dir] [-l less.exe] [-r temp-dir] [-s lt_screen] [-t lesstest] [-O lesstest-opts] [file.lt | dir]...\n";
|
|
|
|
use Getopt::Std;
|
|
use Cwd;
|
|
@@ -18,7 +18,7 @@ my $num_tests = 0;
|
|
exit main();
|
|
sub main {
|
|
my %opt;
|
|
- die $usage if not getopts('d:el:O:r:s:t:', \%opt);
|
|
+ die $usage if not getopts('d:eEl:O:r:s:t:', \%opt);
|
|
die $usage if not @ARGV;
|
|
|
|
my $cwd = getcwd();
|
|
@@ -28,9 +28,9 @@ sub main {
|
|
$lt_screen = (rfile($opt{s}, $cwd) or "$srcdir/lt_screen");
|
|
$less = (rfile($opt{l}, $cwd) or "$srcdir/../obj/less");
|
|
$lt_opts = ($opt{O} or "");
|
|
- $err_only = $opt{e};
|
|
+ $err_only = $opt{E} ? 2 : $opt{e} ? 1 : 0;
|
|
$lt_opts = "-$lt_opts" if $lt_opts =~ /^[^-]/;
|
|
- $lt_opts .= " -e" if $err_only;
|
|
+ $lt_opts .= ($err_only == 2) ? " -E" : $err_only ? " -e" : "";
|
|
die "cannot execute $lesstest" if not -x $lesstest;
|
|
die "cannot execute $lt_screen" if not -x $lt_screen;
|
|
die "cannot execute $less" if not -x $less;
|
|
@@ -46,7 +46,7 @@ sub main {
|
|
print "ERRS $errs errors\n";
|
|
return 1;
|
|
}
|
|
- print "RAN $num_tests tests\n";
|
|
+ print "RAN $num_tests tests\n" unless ($err_only == 2);
|
|
return 0;
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|