61 lines
1.9 KiB
Diff
61 lines
1.9 KiB
Diff
From b06f615735f9af67a03f1dfc8e9015af59cb4ca0 Mon Sep 17 00:00:00 2001
|
|
From: Mark Nudelman <markn@greenwoodsoftware.com>
|
|
Date: Mon, 17 Oct 2022 12:26:35 -0700
|
|
Subject: [PATCH 22/48] Minor runtest output tweaks.
|
|
|
|
---
|
|
lesstest/pipeline.c | 8 ++++----
|
|
lesstest/runtest | 10 +++-------
|
|
2 files changed, 7 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/lesstest/pipeline.c b/lesstest/pipeline.c
|
|
index 01fe15d..78cc9e7 100644
|
|
--- a/lesstest/pipeline.c
|
|
+++ b/lesstest/pipeline.c
|
|
@@ -33,10 +33,10 @@ static void become_child_less(char* less, int argc, char* const* argv, char* con
|
|
dup_std(less_in_pipe[RD], screen_in_pipe[WR]);
|
|
|
|
char** less_argv = malloc(sizeof(char*) * (argc + 6));
|
|
- less_argv[0] = less;
|
|
- less_argv[1] = "--tty";
|
|
- less_argv[2] = "/dev/stdin";
|
|
- int less_argc = 3;//5;
|
|
+ int less_argc = 0;
|
|
+ less_argv[less_argc++] = less;
|
|
+ less_argv[less_argc++] = "--tty";
|
|
+ less_argv[less_argc++] = "/dev/stdin";
|
|
while (--argc > 0) {
|
|
char* arg = *++argv;
|
|
less_argv[less_argc++] = (argc > 1 || tempfile == NULL) ? arg : (char*) tempfile;
|
|
diff --git a/lesstest/runtest b/lesstest/runtest
|
|
index 1626641..625c95c 100755
|
|
--- a/lesstest/runtest
|
|
+++ b/lesstest/runtest
|
|
@@ -2,7 +2,7 @@
|
|
use strict;
|
|
|
|
# Run one or more test files.
|
|
-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";
|
|
+my $usage = "usage: runtest [-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;
|
|
@@ -42,12 +42,8 @@ sub main {
|
|
$errs += run(rfile($file, $cwd));
|
|
}
|
|
system "rm -rf '$rundir'";
|
|
- if ($errs > 0) {
|
|
- print "ERRS $errs errors\n";
|
|
- return 1;
|
|
- }
|
|
- print "RAN $num_tests tests\n" unless ($err_only == 2);
|
|
- return 0;
|
|
+ print "RAN $num_tests tests with $errs errors\n" if $errs > 0 or $err_only != 2;
|
|
+ return ($errs > 0);
|
|
}
|
|
|
|
# Run a xxx.lt file.
|
|
--
|
|
2.27.0
|
|
|