aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-19 20:33:12 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-19 20:33:12 +0000
commit9c724bc1807b2938ab1832b2ecddedbcb3b3c43e (patch)
treedbee49e88370fde2a0cd45353460ca3e2c134238
parent7d463d057f3d01307066bdfaf4a77db2a604ff5d (diff)
downloadpaludis-9c724bc1807b2938ab1832b2ecddedbcb3b3c43e.tar.gz
paludis-9c724bc1807b2938ab1832b2ecddedbcb3b3c43e.tar.xz
autotools sucks
-rw-r--r--ebuild/utils/merge_TEST.bash14
-rw-r--r--ebuild/utils/unmerge_TEST.bash8
2 files changed, 11 insertions, 11 deletions
diff --git a/ebuild/utils/merge_TEST.bash b/ebuild/utils/merge_TEST.bash
index d964e4b..88b070f 100644
--- a/ebuild/utils/merge_TEST.bash
+++ b/ebuild/utils/merge_TEST.bash
@@ -18,7 +18,7 @@
merge_empty_TEST()
{
- ./merge "merge_TEST_dir/empty_src" \
+ ${PALUDIS_EBUILD_DIR}/utils/merge "merge_TEST_dir/empty_src" \
"merge_TEST_dir/empty_dst" \
"merge_TEST_dir/empty_contents" 1>/dev/null
test_return_code
@@ -26,7 +26,7 @@ merge_empty_TEST()
merge_files_TEST()
{
- ./merge "merge_TEST_dir/files_src" \
+ ${PALUDIS_EBUILD_DIR}/utils/merge "merge_TEST_dir/files_src" \
"merge_TEST_dir/files_dst" \
"merge_TEST_dir/files_contents" 1>/dev/null
test_return_code
@@ -40,7 +40,7 @@ merge_files_TEST()
merge_dirs_TEST()
{
- ./merge "merge_TEST_dir/dirs_src" \
+ ${PALUDIS_EBUILD_DIR}/utils/merge "merge_TEST_dir/dirs_src" \
"merge_TEST_dir/dirs_dst" \
"merge_TEST_dir/dirs_contents" 1>/dev/null
test_return_code
@@ -61,7 +61,7 @@ merge_dirs_TEST()
merge_dirs_over_TEST()
{
- ./merge "merge_TEST_dir/dirs_over_src" \
+ ${PALUDIS_EBUILD_DIR}/utils/merge "merge_TEST_dir/dirs_over_src" \
"merge_TEST_dir/dirs_over_dst" \
"merge_TEST_dir/dirs_over_contents" 1>/dev/null
test_return_code
@@ -82,7 +82,7 @@ merge_dirs_over_TEST()
merge_links_TEST()
{
- ./merge "merge_TEST_dir/links_src" \
+ ${PALUDIS_EBUILD_DIR}/utils/merge "merge_TEST_dir/links_src" \
"merge_TEST_dir/links_dst" \
"merge_TEST_dir/links_contents" 1>/dev/null
test_return_code
@@ -100,7 +100,7 @@ merge_links_TEST()
merge_links_over_TEST()
{
- ./merge "merge_TEST_dir/links_over_src" \
+ ${PALUDIS_EBUILD_DIR}/utils/merge "merge_TEST_dir/links_over_src" \
"merge_TEST_dir/links_over_dst" \
"merge_TEST_dir/links_over_contents" 1>/dev/null
test_return_code
@@ -121,7 +121,7 @@ merge_links_over_TEST()
}
merge_links_over_dir_TEST()
{
- ! ./merge "merge_TEST_dir/links_over_dir_src" \
+ ! ${PALUDIS_EBUILD_DIR}/utils/merge "merge_TEST_dir/links_over_dir_src" \
"merge_TEST_dir/links_over_dir_dst" \
"merge_TEST_dir/links_over_dir_contents" &>/dev/null
test_return_code
diff --git a/ebuild/utils/unmerge_TEST.bash b/ebuild/utils/unmerge_TEST.bash
index 85db165..a9d75d6 100644
--- a/ebuild/utils/unmerge_TEST.bash
+++ b/ebuild/utils/unmerge_TEST.bash
@@ -18,12 +18,12 @@
unmerge_empty_TEST()
{
- ./merge "unmerge_TEST_dir/empty_src" \
+ ${PALUDIS_EBUILD_DIR}/utils/merge "unmerge_TEST_dir/empty_src" \
"unmerge_TEST_dir/empty_dst" \
"unmerge_TEST_dir/empty_contents" 1>/dev/null
test_return_code
- ./unmerge "unmerge_TEST_dir/empty_dst" \
+ ${PALUDIS_EBUILD_DIR}/utils/unmerge "unmerge_TEST_dir/empty_dst" \
"unmerge_TEST_dir/empty_contents" 1>/dev/null
test_return_code
@@ -38,7 +38,7 @@ unmerge_empty_TEST()
unmerge_files_TEST()
{
- ./merge "unmerge_TEST_dir/files_src" \
+ ${PALUDIS_EBUILD_DIR}/utils/merge "unmerge_TEST_dir/files_src" \
"unmerge_TEST_dir/files_dst" \
"unmerge_TEST_dir/files_contents" 1>/dev/null
test_return_code
@@ -51,7 +51,7 @@ unmerge_files_TEST()
done
test_equality "$ok" "yes"
- ./unmerge "unmerge_TEST_dir/files_dst" \
+ ${PALUDIS_EBUILD_DIR}/utils/unmerge "unmerge_TEST_dir/files_dst" \
"unmerge_TEST_dir/files_contents" 1>/dev/null
test_return_code