From 63b9d60b31dd3f21f9c3345529fbb124fb5db62f Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Thu, 8 Dec 2011 22:19:04 +0000
Subject: [PATCH] MKSH_DISABLE_DEPRECATED needs testsuite handling

---
 Build.sh |  7 +++++--
 check.t  | 41 +++++++++++++++++++++++++++++++++++++----
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/Build.sh b/Build.sh
index d25978f..036fc65 100644
--- a/Build.sh
+++ b/Build.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.496 2011/12/08 22:16:42 tg Exp $'
+srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.497 2011/12/08 22:19:03 tg Exp $'
 #-
 # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #	Thorsten Glaser <tg@mirbsd.org>
@@ -1139,6 +1139,9 @@ ac_ifcpp 'ifdef MKSH_ASSUME_UTF8' isset_MKSH_ASSUME_UTF8 '' \
 ac_ifcpp 'ifdef MKSH_CONSERVATIVE_FDS' isset_MKSH_CONSERVATIVE_FDS '' \
     'if traditional/conservative fd use is requested' && \
     check_categories="$check_categories convfds"
+ac_ifcpp 'ifdef MKSH_DISABLE_DEPRECATED' isset_MKSH_DISABLE_DEPRECATED '' \
+    "if deprecated features are to be omitted" && \
+    check_categories="$check_categories nodeprecated"
 
 #
 # Environment: headers
@@ -1174,7 +1177,7 @@ else
 		#define EXTERN
 		#define MKSH_INCLUDES_ONLY
 		#include "sh.h"
-		__RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.496 2011/12/08 22:16:42 tg Exp $");
+		__RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.497 2011/12/08 22:19:03 tg Exp $");
 		int main(void) { printf("Hello, World!\n"); return (0); }
 EOF
 	case $cm in
diff --git a/check.t b/check.t
index e2f3bba..5a365f1 100644
--- a/check.t
+++ b/check.t
@@ -1,4 +1,4 @@
-# $MirOS: src/bin/mksh/check.t,v 1.498 2011/12/02 22:55:46 tg Exp $
+# $MirOS: src/bin/mksh/check.t,v 1.499 2011/12/08 22:19:04 tg Exp $
 # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $
 # $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $
 # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $
@@ -8866,7 +8866,7 @@ expected-stdout:
 name: event-subst-1a
 description:
 	Check that '!' substitution in interactive mode works
-category: !smksh
+category: !smksh,!nodeprecated
 file-setup: file 755 "falsetto"
 	#! /bin/sh
 	echo molto bene
@@ -8895,7 +8895,7 @@ description:
 	even when a space separates it from the search command,
 	which is not what GNU bash provides but required for the
 	other regression tests below to check
-category: !smksh
+category: !smksh,!nodeprecated
 file-setup: file 755 "falsetto"
 	#! /bin/sh
 	echo molto bene
@@ -8922,7 +8922,7 @@ name: event-subst-2
 description:
 	Check that '!' substitution in interactive mode
 	does not break things
-category: !smksh
+category: !smksh,!nodeprecated
 file-setup: file 755 "falsetto"
 	#! /bin/sh
 	echo molto bene
@@ -8985,6 +8985,39 @@ expected-stdout:
 	= 0
 	foo
 ---
+name: event-subst-0
+description:
+	Check that '!' substitution in interactive mode is ignored
+category: nodeprecated
+need-ctty: yes
+arguments: !-i!
+file-setup: file 755 "falsetto"
+	#! /bin/sh
+	echo molto bene
+	exit 42
+file-setup: file 755 "!false"
+	#! /bin/sh
+	echo si
+stdin:
+	export PATH=.:$PATH
+	falsetto
+	echo yeap
+	!false
+	echo meow
+	! false
+	echo = $?
+	if
+	! false; then echo foo; else echo bar; fi
+expected-stdout:
+	molto bene
+	yeap
+	si
+	meow
+	= 0
+	foo
+expected-stderr-pattern:
+	/.*/
+---
 name: nounset-1
 description:
 	Check that "set -u" matches (future) SUSv4 requirement