summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2022-12-20 09:59:21 +0000
committerLaurent Bercot <ska@appnovation.com>2022-12-20 09:59:21 +0000
commit5e042b7fcb0b1e7ea26effe0782efc29140e46c3 (patch)
tree2386ef28c0dfa4b9423498a41d4add0a9fecbe61
parenta61eb3a7522e61f1016287c222bf42fab64fee9a (diff)
downloads6-portable-utils-5e042b7fcb0b1e7ea26effe0782efc29140e46c3.tar.xz
Deprecate s6-test
Signed-off-by: Laurent Bercot <ska@appnovation.com>
-rw-r--r--NEWS1
-rw-r--r--doc/index.html1
-rw-r--r--doc/s6-test.html10
-rw-r--r--src/skaembutils/s6-test.c1
4 files changed, 12 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 2ee2303..89aa7d2 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ In 2.2.5.1
- Bugfixes.
- Adaptation to skalibs-2.13.0.0.
+ - s6-test is now deprecated: replaced with execline's eltest.
In 2.2.5.0
diff --git a/doc/index.html b/doc/index.html
index 5f7e063..7e222e8 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -163,7 +163,6 @@ the previous versions of s6-portable-utils and the current one. </li>
<li> The <a href="s6-sync.html"><tt>s6-sync</tt></a> program </li>
<li> The <a href="s6-tai64ndiff.html"><tt>s6-tai64ndiff</tt></a> program </li>
<li> The <a href="s6-tail.html"><tt>s6-tail</tt></a> program </li>
- <li> The <a href="s6-test.html"><tt>s6-test</tt></a> program </li>
<li> The <a href="s6-touch.html"><tt>s6-touch</tt></a> program </li>
<li> The <a href="s6-true.html"><tt>s6-true</tt></a> program </li>
<li> The <a href="s6-uniquename.html"><tt>s6-uniquename</tt></a> program </li>
diff --git a/doc/s6-test.html b/doc/s6-test.html
index a8424cd..9c756b6 100644
--- a/doc/s6-test.html
+++ b/doc/s6-test.html
@@ -72,5 +72,15 @@ in order to match whole strings, you must anchor <em>pattern</em> with
<tt>^</tt> and <tt>$</tt> markers. </li>
</ul>
+<h2> Notes </h2>
+
+<ul>
+ <li> <strong>This program is deprecated.</strong> It will disappear in a
+near future version of s6-portable-utils. You are encouraged to use
+<a href="https://skarnet.org/software/execline/eltest.html">eltest</a>
+instead, which has the same interface and functionality, and is a part of the
+<a href="https://skarnet.org/software/execline/">execline</a> package. </li>
+</ul>
+
</body>
</html>
diff --git a/src/skaembutils/s6-test.c b/src/skaembutils/s6-test.c
index 1853fb9..d537619 100644
--- a/src/skaembutils/s6-test.c
+++ b/src/skaembutils/s6-test.c
@@ -522,6 +522,7 @@ errorint:
int main (int argc, char const *const *argv)
{
PROG = "s6-test" ;
+ strerr_warnw1x("this program is now deprecated. Please use execline's eltest instead.") ;
if (argc <= 1) return 1 ;
{
struct node tree[argc + 2] ;