[gentoo-commits] gentoo-projects commit in portage-utils/tests: init.sh

["Mike Frysinger (vapier)" <vapier@gentoo.org>]

vapier      11/12/12 21:04:24

  Modified:             init.sh
  Log:
  first pass at integrating the testsuite into autotools code

Revision  Changes    Path
1.4                  portage-utils/tests/init.sh

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/tests/init.sh?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/tests/init.sh?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/tests/init.sh?r1=1.3&r2=1.4

Index: init.sh
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/tests/init.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- init.sh	17 Mar 2011 03:16:45 -0000	1.3
+++ init.sh	12 Dec 2011 21:04:23 -0000	1.4
@@ -1,10 +1,26 @@
-d=$PWD
-while [[ $d != "/" ]] ; do
-	[[ -e $d/q ]] && break
-	d=${d%/*}
-done
-PATH=$d:$PATH
-unset d
+setup_path() {
+	local d=$PWD
+	while [[ $d != "/" ]] ; do
+		[[ -e $d/q ]] && break
+		d=${d%/*}
+	done
+	PATH=$d:$PATH
+}
+setup_path
+
+# matches tests/subdir.mk
+setup_env() {
+	local a=${0%/*}
+	a=${a##*/}
+
+	: ${b:=.}
+	: ${s:=.}
+	: ${atb:=${PWD}/../..}
+	: ${ats:=${PWD}/../..}
+	: ${ab:=${atb}/tests/${a}}
+	: ${as:=${ats}/tests/${a}}
+}
+setup_env
 
 # clean any random vars from the host system
 unset ROOT PORTAGE_CONFIGROOT PORTAGE_QUIET
@@ -17,13 +33,28 @@
 }
 die() { fail "$@" ; }
 
+skip() {
+	echo "SKIPPED: $*"
+	exit 0
+}
+
 pass() {
 	echo "PASSED"
 	exit 0
 }
 
 mktmpdir() {
-	local d=${1:-tmp}
-	rm -rf "$d" && mkdir "$d" && cd "$d" \
-		|| fail "could not make tmp dir '$1'"
+	local d=${1:-${ab}/tmp}
+	rm -rf "$d" && \
+	mkdir -p "$d" && \
+	pushd "$d" >/dev/null \
+		|| fail "could not make tmp dir '$d'"
+}
+_cleantmpdir() {
+	local cmd=$1; shift
+	local d=${1:-${ab}/tmp}
+	popd >/dev/null
+	${cmd} "${d}" || fail "could not clean tmp dir '$d'"
 }
+cleantmpdir() { _cleantmpdir "rm -rf" "$@" ; }
+trimtmpdir() { _cleantmpdir "rmdir" "$@" ; }