aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-08-07 00:23:21 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-08-07 00:23:21 +0000
commit46a6f12fe3692bfe92e5c5154c30c5af9764599b (patch)
tree6f47317c5406b9e0b41de6303b65fef9be1f0e69
parent7fe40a48a19863835dc932b747e4c1bb80970510 (diff)
downloadpaludis-46a6f12fe3692bfe92e5c5154c30c5af9764599b.tar.gz
paludis-46a6f12fe3692bfe92e5c5154c30c5af9764599b.tar.xz
Fix out of tree build
-rw-r--r--hooks/Makefile.am.m41
-rwxr-xr-xhooks/eselect_env_update_TEST2
-rwxr-xr-xhooks/news_TEST8
3 files changed, 6 insertions, 5 deletions
diff --git a/hooks/Makefile.am.m4 b/hooks/Makefile.am.m4
index a97ffe0..292c124 100644
--- a/hooks/Makefile.am.m4
+++ b/hooks/Makefile.am.m4
@@ -283,5 +283,6 @@ TESTS_ENVIRONMENT = env \
PALUDIS_SKIP_CONFIG="yes" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
+ TOP_SRCDIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)`" \
bash $(top_srcdir)/hooks/run_test.bash
diff --git a/hooks/eselect_env_update_TEST b/hooks/eselect_env_update_TEST
index ced20bb..413c656 100755
--- a/hooks/eselect_env_update_TEST
+++ b/hooks/eselect_env_update_TEST
@@ -23,7 +23,7 @@ eselect_env_update_TEST()
mkdir -p eselect_env_update_TEST_dir/{etc,lib,var/run}
touch eselect_env_update_TEST_dir/etc/ld.so.conf
- ./eselect_env_update.bash >/dev/null ; test_return_code
+ ${TOP_SRCDIR}/hooks/eselect_env_update.bash >/dev/null ; test_return_code
[[ -f eselect_env_update_TEST_dir/etc/ld.so.cache ]] \
|| [[ -f eselect_env_update_TEST/var/run/ld-elf.so.hints ]] ; test_return_code
diff --git a/hooks/news_TEST b/hooks/news_TEST
index 02b39cf..8e2d2a8 100755
--- a/hooks/news_TEST
+++ b/hooks/news_TEST
@@ -23,8 +23,8 @@ news_none_TEST()
export HOOK=sync_all_post
export PALUDIS_HOME=`pwd`/news_TEST_dir/one
- bash ${PALUDIS_HOOKER_DIR}/hooker.bash ./news.hook hook_run_sync_all_post >/dev/null ; test_return_code
- bash ${PALUDIS_HOOKER_DIR}/hooker.bash ./news.hook hook_run_sync_all_post \
+ bash ${PALUDIS_HOOKER_DIR}/hooker.bash ${TOP_SRCDIR}/hooks/news.hook hook_run_sync_all_post >/dev/null ; test_return_code
+ bash ${PALUDIS_HOOKER_DIR}/hooker.bash ${TOP_SRCDIR}/hooks/news.hook hook_run_sync_all_post \
| grep "No unread news items found" >/dev/null ; test_return_code
}
@@ -35,8 +35,8 @@ news_one_TEST()
export HOOK=sync_all_post
export PALUDIS_HOME=`pwd`/news_TEST_dir/two
- bash ${PALUDIS_HOOKER_DIR}/hooker.bash ./news.hook hook_run_sync_all_post >/dev/null ; test_return_code
- bash ${PALUDIS_HOOKER_DIR}/hooker.bash ./news.hook hook_run_sync_all_post \
+ bash ${PALUDIS_HOOKER_DIR}/hooker.bash ${TOP_SRCDIR}/hooks/news.hook hook_run_sync_all_post >/dev/null ; test_return_code
+ bash ${PALUDIS_HOOKER_DIR}/hooker.bash ${TOP_SRCDIR}/hooks/news.hook hook_run_sync_all_post \
| grep "You have 1 unread news item" >/dev/null ; test_return_code
}