| 1 |
commit: ab8ec404a6f4442e09999a577b43f9f211c88f58 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 26 10:05:19 2015 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 26 10:05:19 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=ab8ec404 |
| 7 |
|
| 8 |
tests: abort if init.sh cannot be loaded |
| 9 |
|
| 10 |
This keeps people from running things like `./quse/dotest`. All the |
| 11 |
test code currently expects you're in the subdir to run dotest. |
| 12 |
|
| 13 |
tests/atom_explode/dotest | 2 +- |
| 14 |
tests/install/dotest | 4 ++-- |
| 15 |
tests/mkdir/dotest | 2 +- |
| 16 |
tests/profile/dotest | 2 +- |
| 17 |
tests/qatom/dotest | 2 +- |
| 18 |
tests/qcheck/dotest | 2 +- |
| 19 |
tests/qdepends/dotest | 2 +- |
| 20 |
tests/qfile/dotest | 2 +- |
| 21 |
tests/qlist/dotest | 2 +- |
| 22 |
tests/qlop/dotest | 2 +- |
| 23 |
tests/qmerge/dotest | 2 +- |
| 24 |
tests/qtbz2/dotest | 2 +- |
| 25 |
tests/quse/dotest | 2 +- |
| 26 |
tests/qxpak/dotest | 2 +- |
| 27 |
tests/reinitialize/dotest | 2 +- |
| 28 |
tests/source/dotest | 2 +- |
| 29 |
16 files changed, 17 insertions(+), 17 deletions(-) |
| 30 |
|
| 31 |
diff --git a/tests/atom_explode/dotest b/tests/atom_explode/dotest |
| 32 |
index c4dc913..41d282a 100755 |
| 33 |
--- a/tests/atom_explode/dotest |
| 34 |
+++ b/tests/atom_explode/dotest |
| 35 |
@@ -1,6 +1,6 @@ |
| 36 |
#!/bin/bash |
| 37 |
|
| 38 |
-. ../init.sh |
| 39 |
+. ../init.sh || exit 1 |
| 40 |
|
| 41 |
: ${PORTDIR:=$(portageq envvar PORTDIR)} |
| 42 |
pushd "${PORTDIR}"/metadata/md5-cache >/dev/null || { echo SKIPPED; exit 0 ; } |
| 43 |
|
| 44 |
diff --git a/tests/install/dotest b/tests/install/dotest |
| 45 |
index 246b465..1c790d1 100755 |
| 46 |
--- a/tests/install/dotest |
| 47 |
+++ b/tests/install/dotest |
| 48 |
@@ -1,8 +1,8 @@ |
| 49 |
#!/bin/bash |
| 50 |
|
| 51 |
-rm -f q |
| 52 |
+. ../init.sh || exit 1 |
| 53 |
|
| 54 |
-. ../init.sh |
| 55 |
+rm -f q |
| 56 |
|
| 57 |
applets=$(q -Ch | \ |
| 58 |
sed -n '/^Currently defined applets:/,/^Options/p' | \ |
| 59 |
|
| 60 |
diff --git a/tests/mkdir/dotest b/tests/mkdir/dotest |
| 61 |
index 1034aa3..a47012d 100755 |
| 62 |
--- a/tests/mkdir/dotest |
| 63 |
+++ b/tests/mkdir/dotest |
| 64 |
@@ -1,6 +1,6 @@ |
| 65 |
#!/bin/bash |
| 66 |
|
| 67 |
-. ../init.sh |
| 68 |
+. ../init.sh || exit 1 |
| 69 |
|
| 70 |
set -e |
| 71 |
|
| 72 |
|
| 73 |
diff --git a/tests/profile/dotest b/tests/profile/dotest |
| 74 |
index b4e94c5..2b77ee9 100755 |
| 75 |
--- a/tests/profile/dotest |
| 76 |
+++ b/tests/profile/dotest |
| 77 |
@@ -1,6 +1,6 @@ |
| 78 |
#!/bin/bash |
| 79 |
|
| 80 |
-. ../init.sh |
| 81 |
+. ../init.sh || exit 1 |
| 82 |
|
| 83 |
qenv() { |
| 84 |
# get q to dump its processed env so we can check |
| 85 |
|
| 86 |
diff --git a/tests/qatom/dotest b/tests/qatom/dotest |
| 87 |
index 5580b98..e616a36 100755 |
| 88 |
--- a/tests/qatom/dotest |
| 89 |
+++ b/tests/qatom/dotest |
| 90 |
@@ -1,6 +1,6 @@ |
| 91 |
#!/bin/bash |
| 92 |
|
| 93 |
-. ../init.sh |
| 94 |
+. ../init.sh || exit 1 |
| 95 |
|
| 96 |
test() { |
| 97 |
local num=$1 exp=$2 ret=0 out |
| 98 |
|
| 99 |
diff --git a/tests/qcheck/dotest b/tests/qcheck/dotest |
| 100 |
index 9122321..a0e91fa 100755 |
| 101 |
--- a/tests/qcheck/dotest |
| 102 |
+++ b/tests/qcheck/dotest |
| 103 |
@@ -1,6 +1,6 @@ |
| 104 |
#!/bin/bash |
| 105 |
|
| 106 |
-. ../init.sh |
| 107 |
+. ../init.sh || exit 1 |
| 108 |
|
| 109 |
set -e |
| 110 |
|
| 111 |
|
| 112 |
diff --git a/tests/qdepends/dotest b/tests/qdepends/dotest |
| 113 |
index 8421577..672fb15 100755 |
| 114 |
--- a/tests/qdepends/dotest |
| 115 |
+++ b/tests/qdepends/dotest |
| 116 |
@@ -1,6 +1,6 @@ |
| 117 |
#!/bin/bash |
| 118 |
|
| 119 |
-. ../init.sh |
| 120 |
+. ../init.sh || exit 1 |
| 121 |
|
| 122 |
set -e |
| 123 |
|
| 124 |
|
| 125 |
diff --git a/tests/qfile/dotest b/tests/qfile/dotest |
| 126 |
index 68f54fb..32ca841 100755 |
| 127 |
--- a/tests/qfile/dotest |
| 128 |
+++ b/tests/qfile/dotest |
| 129 |
@@ -1,6 +1,6 @@ |
| 130 |
#!/bin/bash |
| 131 |
|
| 132 |
-. ../init.sh |
| 133 |
+. ../init.sh || exit 1 |
| 134 |
|
| 135 |
tests=( |
| 136 |
"q file -Cq /bin/bash /bin/XXXXX" |
| 137 |
|
| 138 |
diff --git a/tests/qlist/dotest b/tests/qlist/dotest |
| 139 |
index 586ac1d..ddcd761 100755 |
| 140 |
--- a/tests/qlist/dotest |
| 141 |
+++ b/tests/qlist/dotest |
| 142 |
@@ -1,6 +1,6 @@ |
| 143 |
#!/bin/bash |
| 144 |
|
| 145 |
-. ../init.sh |
| 146 |
+. ../init.sh || exit 1 |
| 147 |
|
| 148 |
set -e |
| 149 |
|
| 150 |
|
| 151 |
diff --git a/tests/qlop/dotest b/tests/qlop/dotest |
| 152 |
index 8182e67..6525594 100755 |
| 153 |
--- a/tests/qlop/dotest |
| 154 |
+++ b/tests/qlop/dotest |
| 155 |
@@ -1,6 +1,6 @@ |
| 156 |
#!/bin/bash |
| 157 |
|
| 158 |
-. ../init.sh |
| 159 |
+. ../init.sh || exit 1 |
| 160 |
|
| 161 |
set -e |
| 162 |
|
| 163 |
|
| 164 |
diff --git a/tests/qmerge/dotest b/tests/qmerge/dotest |
| 165 |
index e5a9c23..3fc01f2 100755 |
| 166 |
--- a/tests/qmerge/dotest |
| 167 |
+++ b/tests/qmerge/dotest |
| 168 |
@@ -1,6 +1,6 @@ |
| 169 |
#!/bin/bash |
| 170 |
|
| 171 |
-. ../init.sh |
| 172 |
+. ../init.sh || exit 1 |
| 173 |
|
| 174 |
set -e |
| 175 |
|
| 176 |
|
| 177 |
diff --git a/tests/qtbz2/dotest b/tests/qtbz2/dotest |
| 178 |
index 1f10ac1..fec6d0a 100755 |
| 179 |
--- a/tests/qtbz2/dotest |
| 180 |
+++ b/tests/qtbz2/dotest |
| 181 |
@@ -1,6 +1,6 @@ |
| 182 |
#!/bin/bash |
| 183 |
|
| 184 |
-. ../init.sh |
| 185 |
+. ../init.sh || exit 1 |
| 186 |
|
| 187 |
set -e |
| 188 |
|
| 189 |
|
| 190 |
diff --git a/tests/quse/dotest b/tests/quse/dotest |
| 191 |
index 0b204a4..da7d95e 100755 |
| 192 |
--- a/tests/quse/dotest |
| 193 |
+++ b/tests/quse/dotest |
| 194 |
@@ -1,6 +1,6 @@ |
| 195 |
#!/bin/bash |
| 196 |
|
| 197 |
-. ../init.sh |
| 198 |
+. ../init.sh || exit 1 |
| 199 |
|
| 200 |
set -e |
| 201 |
|
| 202 |
|
| 203 |
diff --git a/tests/qxpak/dotest b/tests/qxpak/dotest |
| 204 |
index c892c84..6c4c78a 100755 |
| 205 |
--- a/tests/qxpak/dotest |
| 206 |
+++ b/tests/qxpak/dotest |
| 207 |
@@ -1,6 +1,6 @@ |
| 208 |
#!/bin/bash |
| 209 |
|
| 210 |
-. ../init.sh |
| 211 |
+. ../init.sh || exit 1 |
| 212 |
|
| 213 |
set -e |
| 214 |
|
| 215 |
|
| 216 |
diff --git a/tests/reinitialize/dotest b/tests/reinitialize/dotest |
| 217 |
index c4e3a50..4b51f6d 100755 |
| 218 |
--- a/tests/reinitialize/dotest |
| 219 |
+++ b/tests/reinitialize/dotest |
| 220 |
@@ -1,6 +1,6 @@ |
| 221 |
#!/bin/bash |
| 222 |
|
| 223 |
-. ../init.sh |
| 224 |
+. ../init.sh || exit 1 |
| 225 |
|
| 226 |
q -Cr |
| 227 |
tend $? "q -CR" |
| 228 |
|
| 229 |
diff --git a/tests/source/dotest b/tests/source/dotest |
| 230 |
index cff4ddf..f39addf 100755 |
| 231 |
--- a/tests/source/dotest |
| 232 |
+++ b/tests/source/dotest |
| 233 |
@@ -1,6 +1,6 @@ |
| 234 |
#!/bin/bash |
| 235 |
|
| 236 |
-. ../init.sh |
| 237 |
+. ../init.sh || exit 1 |
| 238 |
|
| 239 |
testit() { |
| 240 |
if [ -s $1 ] ; then |
Archives