diff options
| author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-08-03 12:17:20 -0700 |
|---|---|---|
| committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-08-03 12:17:20 -0700 |
| commit | 82d742b818f730a0bac008075f1b6fad2758747f (patch) | |
| tree | 246b97d8da995eb53408c6dcc41409515b5c3887 /test | |
| parent | 69d7089ab3bec9953877f20b008e7b7dd99a3459 (diff) | |
| parent | d438ff5d25372ba32e42f89c808f5b33a25042f3 (diff) | |
Merge branch 'master' of http://projects.parabolagnulinux.org/dbscripts into stable
Diffstat (limited to 'test')
| -rw-r--r-- | test/lib/common.inc | 2 | ||||
| -rwxr-xr-x | test/test.d/packages.sh | 4 |
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" |