From 2f3c4f4e488313b151ca2566376148ea19d0a88d Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Tue, 4 Apr 2023 03:53:57 -0400
Subject: [PATCH] tests: unbork

Many of the tests were broken from expecting a specific ~~version~~ commit hash
string in the command output (the $Id$ stuff).
Another was broken by a new argument added by void.
---
 .gitignore        | 3 +++
 src/Makefile      | 2 +-
 src/chpst.check   | 2 --
 src/chpst.dist    | 6 +-----
 src/sv.check      | 2 --
 src/sv.dist       | 4 ----
 src/svlogd.check  | 2 --
 src/svlogd.dist   | 4 ----
 src/utmpset.check | 2 --
 src/utmpset.dist  | 4 ----
 10 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 30b95d8..2cf0ebf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,6 @@ src/utmpset
 # Generated completions
 sv.bash
 sv.zsh
+
+# Test output
+src/*.local
diff --git a/src/Makefile b/src/Makefile
index e7ee715..2c46c55 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,7 +16,7 @@ install: all
 	done
 
 clean:
-	rm -f *.o *.a $(PROGS)
+	rm -f *.o *.a $(PROGS) *.local
 
 runit: runit.o unix.a byte.a
 	@printf " [CCLD]\t\t$@\n"
diff --git a/src/chpst.check b/src/chpst.check
index 384113e..4510693 100755
--- a/src/chpst.check
+++ b/src/chpst.check
@@ -3,8 +3,6 @@ rm -rf "${ctmp}"
 
 chpst
 echo $?
-chpst -V
-echo $?
 
 # -u
 # -U
diff --git a/src/chpst.dist b/src/chpst.dist
index 6779bfd..bfeaa11 100644
--- a/src/chpst.dist
+++ b/src/chpst.dist
@@ -1,8 +1,4 @@
-usage: chpst [-vP012] [-u user[:group]] [-U user[:group]] [-b argv0] [-e dir] [-/ root] [-n nice] [-l|-L lock] [-m n] [-d n] [-o n] [-p n] [-f n] [-c n] prog
-
-100
-$Id: f279d44141c981dd7535a12260efcf1ef7beed26 $
-usage: chpst [-vP012] [-u user[:group]] [-U user[:group]] [-b argv0] [-e dir] [-/ root] [-n nice] [-l|-L lock] [-m n] [-d n] [-o n] [-p n] [-f n] [-c n] prog
+usage: chpst [-vP012] [-u user[:group]] [-U user[:group]] [-b argv0] [-e dir] [-/ root] [-C pwd] [-n nice] [-l|-L lock] [-m n] [-d n] [-o n] [-p n] [-f n] [-c n] prog
 
 100
 test=1
diff --git a/src/sv.check b/src/sv.check
index d3c277c..a778719 100755
--- a/src/sv.check
+++ b/src/sv.check
@@ -4,8 +4,6 @@ trap 'rm -rf "${ctmp}"' EXIT
 
 sv
 echo $?
-sv -V
-echo $?
 
 mkdir "${ctmp}"
 cat >"${ctmp}"/run <<-\EOT
diff --git a/src/sv.dist b/src/sv.dist
index 5b6c3ee..d0d86ca 100644
--- a/src/sv.dist
+++ b/src/sv.dist
@@ -1,9 +1,5 @@
 usage: sv [-v] [-w sec] command service ...
 
-100
-$Id: 900314260c6d52c986c5357673bea2f3bd3f4698 $
-usage: sv [-v] [-w sec] command service ...
-
 100
 starting
 0
diff --git a/src/svlogd.check b/src/svlogd.check
index 7d926ef..383f930 100755
--- a/src/svlogd.check
+++ b/src/svlogd.check
@@ -3,8 +3,6 @@ rm -rf "${ctmp}"
 
 svlogd
 echo $?
-svlogd -V
-echo $?
 
 mkdir "${ctmp}"
 echo foo |svlogd "${ctmp}"
diff --git a/src/svlogd.dist b/src/svlogd.dist
index b3329e6..d29b1e6 100644
--- a/src/svlogd.dist
+++ b/src/svlogd.dist
@@ -1,9 +1,5 @@
 usage: svlogd [-ttv] [-r c] [-R abc] [-l len] [-b buflen] dir ...
 
-111
-$Id: 5e55a90e0a1b35ec47fed3021453c50675ea1117 $
-usage: svlogd [-ttv] [-r c] [-R abc] [-l len] [-b buflen] dir ...
-
 111
 0
 foo
diff --git a/src/utmpset.check b/src/utmpset.check
index 51cf1a4..f68f01f 100755
--- a/src/utmpset.check
+++ b/src/utmpset.check
@@ -1,5 +1,3 @@
 #!/bin/sh
 utmpset
 echo $?
-utmpset -V
-echo $?
diff --git a/src/utmpset.dist b/src/utmpset.dist
index d5c0370..2340829 100644
--- a/src/utmpset.dist
+++ b/src/utmpset.dist
@@ -1,7 +1,3 @@
 usage: utmpset [-w] line
 
 1
-$Id: cb399098f794012a7f5e6a3a7090b2d53b86c08c $
-usage: utmpset [-w] line
-
-1