[gentoo-commits] proj/portage-utils:master commit in: tests/qatom/, tests/qfile/, tests/qdepends/, tests/profile/, tests/mkdir/, ...

[gentoo-commits] proj/portage-utils:master commit in: tests/qatom/, tests/qfile/, tests/qdepends/, tests/profile/, tests/mkdir/, ...

[Mike Frysinger]

commit:     ab8ec404a6f4442e09999a577b43f9f211c88f58
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 10:05:19 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 10:05:19 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=ab8ec404

tests: abort if init.sh cannot be loaded

This keeps people from running things like `./quse/dotest`.  All the
test code currently expects you're in the subdir to run dotest.

 tests/atom_explode/dotest | 2 +-
 tests/install/dotest      | 4 ++--
 tests/mkdir/dotest        | 2 +-
 tests/profile/dotest      | 2 +-
 tests/qatom/dotest        | 2 +-
 tests/qcheck/dotest       | 2 +-
 tests/qdepends/dotest     | 2 +-
 tests/qfile/dotest        | 2 +-
 tests/qlist/dotest        | 2 +-
 tests/qlop/dotest         | 2 +-
 tests/qmerge/dotest       | 2 +-
 tests/qtbz2/dotest        | 2 +-
 tests/quse/dotest         | 2 +-
 tests/qxpak/dotest        | 2 +-
 tests/reinitialize/dotest | 2 +-
 tests/source/dotest       | 2 +-
 16 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/tests/atom_explode/dotest b/tests/atom_explode/dotest
index c4dc913..41d282a 100755
--- a/tests/atom_explode/dotest
+++ b/tests/atom_explode/dotest
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ../init.sh
+. ../init.sh || exit 1
 
 : ${PORTDIR:=$(portageq envvar PORTDIR)}
 pushd "${PORTDIR}"/metadata/md5-cache >/dev/null || { echo SKIPPED; exit 0 ; }

diff --git a/tests/install/dotest b/tests/install/dotest
index 246b465..1c790d1 100755
--- a/tests/install/dotest
+++ b/tests/install/dotest
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-rm -f q
+. ../init.sh || exit 1
 
-. ../init.sh
+rm -f q
 
 applets=$(q -Ch | \
 	sed -n '/^Currently defined applets:/,/^Options/p' | \

diff --git a/tests/mkdir/dotest b/tests/mkdir/dotest
index 1034aa3..a47012d 100755
--- a/tests/mkdir/dotest
+++ b/tests/mkdir/dotest
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ../init.sh
+. ../init.sh || exit 1
 
 set -e
 

diff --git a/tests/profile/dotest b/tests/profile/dotest
index b4e94c5..2b77ee9 100755
--- a/tests/profile/dotest
+++ b/tests/profile/dotest
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ../init.sh
+. ../init.sh || exit 1
 
 qenv() {
 	# get q to dump its processed env so we can check

diff --git a/tests/qatom/dotest b/tests/qatom/dotest
index 5580b98..e616a36 100755
--- a/tests/qatom/dotest
+++ b/tests/qatom/dotest
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ../init.sh
+. ../init.sh || exit 1
 
 test() {
 	local num=$1 exp=$2 ret=0 out

diff --git a/tests/qcheck/dotest b/tests/qcheck/dotest
index 9122321..a0e91fa 100755
--- a/tests/qcheck/dotest
+++ b/tests/qcheck/dotest
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ../init.sh
+. ../init.sh || exit 1
 
 set -e
 

diff --git a/tests/qdepends/dotest b/tests/qdepends/dotest
index 8421577..672fb15 100755
--- a/tests/qdepends/dotest
+++ b/tests/qdepends/dotest
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ../init.sh
+. ../init.sh || exit 1
 
 set -e
 

diff --git a/tests/qfile/dotest b/tests/qfile/dotest
index 68f54fb..32ca841 100755
--- a/tests/qfile/dotest
+++ b/tests/qfile/dotest
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ../init.sh
+. ../init.sh || exit 1
 
 tests=(
 	"q file -Cq /bin/bash /bin/XXXXX"

diff --git a/tests/qlist/dotest b/tests/qlist/dotest
index 586ac1d..ddcd761 100755
--- a/tests/qlist/dotest
+++ b/tests/qlist/dotest
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ../init.sh
+. ../init.sh || exit 1
 
 set -e
 

diff --git a/tests/qlop/dotest b/tests/qlop/dotest
index 8182e67..6525594 100755
--- a/tests/qlop/dotest
+++ b/tests/qlop/dotest
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ../init.sh
+. ../init.sh || exit 1
 
 set -e
 

diff --git a/tests/qmerge/dotest b/tests/qmerge/dotest
index e5a9c23..3fc01f2 100755
--- a/tests/qmerge/dotest
+++ b/tests/qmerge/dotest
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ../init.sh
+. ../init.sh || exit 1
 
 set -e
 

diff --git a/tests/qtbz2/dotest b/tests/qtbz2/dotest
index 1f10ac1..fec6d0a 100755
--- a/tests/qtbz2/dotest
+++ b/tests/qtbz2/dotest
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ../init.sh
+. ../init.sh || exit 1
 
 set -e
 

diff --git a/tests/quse/dotest b/tests/quse/dotest
index 0b204a4..da7d95e 100755
--- a/tests/quse/dotest
+++ b/tests/quse/dotest
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ../init.sh
+. ../init.sh || exit 1
 
 set -e
 

diff --git a/tests/qxpak/dotest b/tests/qxpak/dotest
index c892c84..6c4c78a 100755
--- a/tests/qxpak/dotest
+++ b/tests/qxpak/dotest
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ../init.sh
+. ../init.sh || exit 1
 
 set -e
 

diff --git a/tests/reinitialize/dotest b/tests/reinitialize/dotest
index c4e3a50..4b51f6d 100755
--- a/tests/reinitialize/dotest
+++ b/tests/reinitialize/dotest
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ../init.sh
+. ../init.sh || exit 1
 
 q -Cr
 tend $? "q -CR"

diff --git a/tests/source/dotest b/tests/source/dotest
index cff4ddf..f39addf 100755
--- a/tests/source/dotest
+++ b/tests/source/dotest
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ../init.sh
+. ../init.sh || exit 1
 
 testit() {
 	if [ -s $1 ] ; then