From 5e042b7fcb0b1e7ea26effe0782efc29140e46c3 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 20 Dec 2022 09:59:21 +0000
Subject:  Deprecate s6-test

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 NEWS                      |  1 +
 doc/index.html            |  1 -
 doc/s6-test.html          | 10 ++++++++++
 src/skaembutils/s6-test.c |  1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

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] ;
-- 
cgit 1.4.1