summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2011-08-03 16:11:36 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2011-08-03 16:11:36 -0300
commitda9ed1038f53c8b3cd350e8efafb3146d3e16795 (patch)
tree560bd49be0ee5d1489e01548ec9ee77df60c75e0 /test
parent91210f8ae18f5651ace2273cfa0c8ad7e4dbcbdf (diff)
parentc26ba3ccee6700bc0be0031df959d96918f7800f (diff)
Merge branch 'master' of https://projects.archlinux.org/git/dbscripts
Diffstat (limited to 'test')
-rw-r--r--test/lib/common.inc2
-rwxr-xr-xtest/test.d/packages.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/test/lib/common.inc b/test/lib/common.inc
index eb46508..c96e677 100644
--- a/test/lib/common.inc
+++ b/test/lib/common.inc
@@ -11,7 +11,7 @@ oneTimeSetUp() {
local pkgarch
local pkgversion
local build
- pkgdir="$(mktemp -d /dev/shm/$(basename $0).XXXXXXXXXX)"
+ pkgdir="$(mktemp -d /tmp/$(basename $0).XXXXXXXXXX)"
cp -Lr $(dirname ${BASH_SOURCE[0]})/../packages/* "${pkgdir}"
msg 'Building packages...'
for d in "${pkgdir}"/*; do
diff --git a/test/test.d/packages.sh b/test/test.d/packages.sh
index 324f73a..488cb15 100755
--- a/test/test.d/packages.sh
+++ b/test/test.d/packages.sh
@@ -4,8 +4,8 @@ curdir=$(readlink -e $(dirname $0))
. "${curdir}/../lib/common.inc"
testPackages() {
- # TODO: namcap -r depends fails with i686 packages
- find "${pkgdir}" -name "*${PKGEXT}" -exec namcap -e depends {} + || fail 'namcap failed'
+ # TODO: namcap -r sodepends fails with i686 packages
+ find "${pkgdir}" -name "*${PKGEXT}" -exec namcap -e sodepends,pkgnameindesc {} + || fail 'namcap failed'
}
. "${curdir}/../lib/shunit2"