[gentoo-commits] gentoo-x86 commit in eclass/tests: eutils:eshopts.sh tests-common.sh

[gentoo-commits] gentoo-x86 commit in eclass/tests: eutils:eshopts.sh tests-common.sh

[Mike Frysinger (vapier)]

vapier      11/12/17 06:09:46

  Modified:             eutils:eshopts.sh tests-common.sh
  Log:
  extend eshopts test coverage

Revision  Changes    Path
1.2                  eclass/tests/eutils:eshopts.sh

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/tests/eutils:eshopts.sh?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/tests/eutils:eshopts.sh?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/tests/eutils:eshopts.sh?r1=1.1&r2=1.2

Index: eutils:eshopts.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/tests/eutils:eshopts.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eutils:eshopts.sh	17 Dec 2011 03:28:48 -0000	1.1
+++ eutils:eshopts.sh	17 Dec 2011 06:09:46 -0000	1.2
@@ -4,8 +4,41 @@
 
 inherit eutils
 
-# bug 395025
-eshopts_push -s nullglob
-eshopts_pop
+test-it() {
+	local s0 s1 s2
+
+	tbegin "push/pop '$*'"
+	s0=$(shopt -p)
+	t eshopts_push $*
+	s1=$(shopt -p)
+	t eshopts_pop
+	s2=$(shopt -p)
+	[[ ${s0} == "${s2}" ]] && \
+	[[ ${s1} == *"shopt $*"* ]]
+	tend $?
+}
+
+# should handle bug #395025
+for arg in nullglob dotglob extglob ; do
+	for flag in s u ; do
+		test-it -${flag} ${arg}
+	done
+done
+
+tbegin "multi push/pop"
+s0=$(shopt -p)
+t eshopts_push -s dotglob
+t eshopts_push -u dotglob
+t eshopts_push -s extglob
+t eshopts_push -u dotglob
+t eshopts_push -s dotglob
+t eshopts_pop
+t eshopts_pop
+t eshopts_pop
+t eshopts_pop
+t eshopts_pop
+s1=$(shopt -p)
+[[ ${s0} == "${s1}" ]]
+tend $?
 
 texit



1.8                  eclass/tests/tests-common.sh

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/tests/tests-common.sh?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/tests/tests-common.sh?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/tests/tests-common.sh?r1=1.7&r2=1.8

Index: tests-common.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/tests/tests-common.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tests-common.sh	15 Dec 2011 00:15:09 -0000	1.7
+++ tests-common.sh	17 Dec 2011 06:09:46 -0000	1.8
@@ -96,6 +96,11 @@
 	exit ${tret}
 }
 tend() {
-	eend "$@"
-	: $(( tret |= $? ))
+	t eend "$@"
+}
+t() {
+	"$@"
+	local ret=$?
+	: $(( tret |= ${ret} ))
+	return ${ret}
 }