Module Name: src
Committed By: christos
Date: Mon Nov 14 20:23:29 UTC 2011
Modified Files:
src/tests/util/sh: Makefile
Added Files:
src/tests/util/sh: t_evaltested.sh
Log Message:
Add a test for PR/45613 (eval failing in a tested context)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/util/sh/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/util/sh/t_evaltested.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/sh/Makefile
diff -u src/tests/util/sh/Makefile:1.3 src/tests/util/sh/Makefile:1.4
--- src/tests/util/sh/Makefile:1.3 Tue Oct 20 17:58:35 2009
+++ src/tests/util/sh/Makefile Mon Nov 14 15:23:29 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/10/20 21:58:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2011/11/14 20:23:29 christos Exp $
.include <bsd.own.mk>
@@ -7,6 +7,7 @@ TESTSDIR= ${TESTSBASE}/util/sh
TESTS_SH= t_compexit
TESTS_SH+= t_exit
TESTS_SH+= t_expand
+TESTS_SH+= t_evaltested
TESTS_SH+= t_fsplit
TESTS_SH+= t_here
TESTS_SH+= t_set_e
Added files:
Index: src/tests/util/sh/t_evaltested.sh
diff -u /dev/null src/tests/util/sh/t_evaltested.sh:1.1
--- /dev/null Mon Nov 14 15:23:29 2011
+++ src/tests/util/sh/t_evaltested.sh Mon Nov 14 15:23:29 2011
@@ -0,0 +1,67 @@
+# $NetBSD: t_evaltested.sh,v 1.1 2011/11/14 20:23:29 christos Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+# must display the following acknowledgement:
+# This product includes software developed by the NetBSD
+# Foundation, Inc. and its contributors.
+# 4. Neither the name of The NetBSD Foundation nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+atf_test_case evaltested
+
+evaltested_head() {
+ atf_set "descr" "Tests that eval in a tested context does not exit"
+}
+
+evaltested_body() {
+ set -e
+cat > helper.sh << EOF
+set -e
+if eval false
+then
+ echo "'eval false' returned true"
+ exit 1
+fi
+echo "passed"
+exit 0
+EOF
+ output="$(/bin/sh helper.sh)"
+ [ $? = 0 ] && return
+
+ if [ -n "$output" ]
+ then
+ atf_fail "$output"
+ else
+ atf_fail "'eval false' exited from a tested context"
+ fi
+
+}
+
+atf_init_test_cases() {
+ atf_add_test_case evaltested
+}
