[master] 4908ac9 Retire err_shell where it was recently introduced

[Dridi Boukelmoune]

commit 4908ac9f6f462ed98b73d0236eb2ce28f1ef16e8
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Fri Jan 20 16:17:13 2017 +0100

    Retire err_shell where it was recently introduced
    
    Not part of a release, so not using a deprecation message.

diff --git a/bin/varnishtest/vtc.c b/bin/varnishtest/vtc.c
index 831ad0b..8f29889 100644
--- a/bin/varnishtest/vtc.c
+++ b/bin/varnishtest/vtc.c
@@ -546,10 +546,6 @@ cmd_shell(CMD_ARGS)
  * err_shell expect the shell command to fail AND stdout to match the string,
  * failing the test case otherwise.
  */
-/* SECTION: client-server.spec.shell err_shell
- *
- * Same as for the top-level err_shell.
- */
 
 void
 cmd_err_shell(CMD_ARGS)
diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index 7c0d36b..f7f61a5 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -1799,9 +1799,9 @@ cmd_http_stream(CMD_ARGS)
  *
  * write_body STRING
  *	Write the body of a request or a response to a file. By using the
- *	shell or err_shell commands, higher-level checks on the body can
- *	be performed (eg. XML, JSON, ...) provided that such checks can be
- *	delegated to an external program.
+ *	shell command, higher-level checks on the body can be performed
+ *	(eg. XML, JSON, ...) provided that such checks can be delegated
+ *	to an external program.
  */
 static void
 cmd_http_write_body(CMD_ARGS)
@@ -1878,7 +1878,6 @@ static const struct cmds http_cmds[] = {
 	/* general purpose */
 	CMD(barrier)
 	CMD(delay)
-	CMD(err_shell)
 	CMD(shell)
 #undef CMD_HTTP
 #undef CMD
diff --git a/bin/varnishtest/vtc_http2.c b/bin/varnishtest/vtc_http2.c
index da9e540..12a84f3 100644
--- a/bin/varnishtest/vtc_http2.c
+++ b/bin/varnishtest/vtc_http2.c
@@ -2528,9 +2528,8 @@ static const struct cmds stream_cmds[] = {
 	/* general purpose */
 	CMD(barrier)
 	CMD(delay)
-	CMD(err_shell)
 	CMD(shell)
-	{ NULL,			NULL }
+	{ NULL, NULL }
 #undef CMD_STREAM
 #undef CMD
 };