summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--db-functions1
-rwxr-xr-xtest/runTest4
-rwxr-xr-xtest/test.d/db-update.sh2
-rwxr-xr-xtest/test.d/testing2x.sh2
4 files changed, 9 insertions, 0 deletions
diff --git a/db-functions b/db-functions
index abec505..2949578 100644
--- a/db-functions
+++ b/db-functions
@@ -26,6 +26,7 @@ mv_acl() {
if [[ $USER != $DBSCRIPTS_USER ]]; then
exec sudo -H -u $DBSCRIPTS_USER "$0" "$@"
+# TODO: uncomment this again and make sure the testsuite doesn't break because of it
#else
#cd "$TMPDIR"
fi
diff --git a/test/runTest b/test/runTest
index 24c6c31..5884aad 100755
--- a/test/runTest
+++ b/test/runTest
@@ -8,6 +8,10 @@ else
tests=("$(dirname ${BASH_SOURCE[0]})/test.d/"*.sh)
fi
+# TODO: this should be ported to tap.sh https://github.com/andrewgregory/tap.sh
+# and use something similar to the next line
+# prove --ext .php --state=hot,slow,all,save --timer -o -e "php index.php tools test $url" -r "$@" application/test/tests/
+
for t in "${tests[@]}"; do
l=$(basename ${t} .sh)
if [ -x ${t} ]; then
diff --git a/test/test.d/db-update.sh b/test/test.d/db-update.sh
index 6fe0321..bc7833e 100755
--- a/test/test.d/db-update.sh
+++ b/test/test.d/db-update.sh
@@ -82,6 +82,7 @@ testUpdateAnyPackage() {
pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null
sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
arch_svn commit -q -m"update pkg to pkgrel=2" >/dev/null
+ # TODO: move this to the initial build phase
sudo chronic extra-i686-build
mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/"
popd >/dev/null
@@ -100,6 +101,7 @@ testUpdateAnyPackageToDifferentRepositoriesAtOnce() {
pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null
sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
arch_svn commit -q -m"update pkg to pkgrel=2" >/dev/null
+ # TODO: move this to the initial build phase
sudo chronic extra-i686-build
mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/"
popd >/dev/null
diff --git a/test/test.d/testing2x.sh b/test/test.d/testing2x.sh
index 29c10e6..e8efb4e 100755
--- a/test/test.d/testing2x.sh
+++ b/test/test.d/testing2x.sh
@@ -10,6 +10,7 @@ testTesting2xAnyPackage() {
pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null
sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
arch_svn commit -q -m"update pkg to pkgrel=2" >/dev/null
+ # TODO: move this to the initial build phase
sudo chronic extra-i686-build
mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/"
popd >/dev/null
@@ -34,6 +35,7 @@ testTesting2xMultiArchPackage() {
pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null
sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
arch_svn commit -q -m"update pkg to pkgrel=2" >/dev/null
+ # TODO: move this to the initial build phase
sudo chronic extra-i686-build
mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/"
popd >/dev/null