aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-08-28 18:38:18 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-08-28 18:50:19 +0100
commit5c804dc652872b9a9c4abbf6656d7e559a25ea65 (patch)
treee967cac5e122c043ef2de68b16b03faef4865602
parent084299d17ef2824ebafa0c8b51d63019cba041dc (diff)
downloadpaludis-5c804dc652872b9a9c4abbf6656d7e559a25ea65.tar.gz
paludis-5c804dc652872b9a9c4abbf6656d7e559a25ea65.tar.xz
Fix test paths
-rwxr-xr-xsrc/clients/paludis/install_TEST_setup.sh18
-rwxr-xr-xsrc/clients/paludis/upgrade_TEST_setup.sh16
2 files changed, 17 insertions, 17 deletions
diff --git a/src/clients/paludis/install_TEST_setup.sh b/src/clients/paludis/install_TEST_setup.sh
index 07c975e..cd02d83 100755
--- a/src/clients/paludis/install_TEST_setup.sh
+++ b/src/clients/paludis/install_TEST_setup.sh
@@ -19,29 +19,29 @@ END
for c in vdb exndbam ; do
- mkdir -p root/${SYSCONFDIR}/paludis${c}/repositories
- cat <<END > root/${SYSCONFDIR}/paludis${c}/use.conf
+ mkdir -p root/${SYSCONFDIR}/paludis-${c}/repositories
+ cat <<END > root/${SYSCONFDIR}/paludis-${c}/use.conf
*/* foo
END
- cat <<END > root/${SYSCONFDIR}/paludis${c}/environment.conf
+ cat <<END > root/${SYSCONFDIR}/paludis-${c}/environment.conf
world = `pwd`/root/world-${c}
END
- cat <<END > root/${SYSCONFDIR}/paludis${c}/licenses.conf
+ cat <<END > root/${SYSCONFDIR}/paludis-${c}/licenses.conf
*/* *
END
- cat <<END > root/${SYSCONFDIR}/paludis${c}/keywords.conf
+ cat <<END > root/${SYSCONFDIR}/paludis-${c}/keywords.conf
*/* test
END
- cat <<END > root/${SYSCONFDIR}/paludis${c}/bashrc
+ cat <<END > root/${SYSCONFDIR}/paludis-${c}/bashrc
export CHOST="my-chost"
export USER_BASHRC_WAS_USED=yes
END
- cat <<END > root/${SYSCONFDIR}/paludis${c}/repositories/repo1.conf
+ cat <<END > root/${SYSCONFDIR}/paludis-${c}/repositories/repo1.conf
location = `pwd`/repo1
cache = /var/empty
format = ebuild
@@ -52,7 +52,7 @@ END
done
-cat <<END > root/${SYSCONFDIR}/paludisvdb/repositories/installed.conf
+cat <<END > root/${SYSCONFDIR}/paludis-vdb/repositories/installed.conf
location = `pwd`/root/var/db/pkg
format = vdb
names_cache = /var/empty
@@ -60,7 +60,7 @@ provides_cache = /var/empty
builddir = `pwd`/build
END
-cat <<END > root/${SYSCONFDIR}/paludisexndbam/repositories/installed.conf
+cat <<END > root/${SYSCONFDIR}/paludis-exndbam/repositories/installed.conf
location = `pwd`/root/var/db/exndbam
format = exndbam
builddir = `pwd`/build
diff --git a/src/clients/paludis/upgrade_TEST_setup.sh b/src/clients/paludis/upgrade_TEST_setup.sh
index 866175a..55b416b 100755
--- a/src/clients/paludis/upgrade_TEST_setup.sh
+++ b/src/clients/paludis/upgrade_TEST_setup.sh
@@ -19,25 +19,25 @@ END
for a in vdb exndbam ; do
- mkdir -p root/${SYSCONFDIR}/paludis${a}/repositories
- cat <<END > root/${SYSCONFDIR}/paludis${a}/use.conf
+ mkdir -p root/${SYSCONFDIR}/paludis-${a}/repositories
+ cat <<END > root/${SYSCONFDIR}/paludis-${a}/use.conf
*/* foo
END
- cat <<END > root/${SYSCONFDIR}/paludis${a}/licenses.conf
+ cat <<END > root/${SYSCONFDIR}/paludis-${a}/licenses.conf
*/* *
END
- cat <<END > root/${SYSCONFDIR}/paludis${a}/keywords.conf
+ cat <<END > root/${SYSCONFDIR}/paludis-${a}/keywords.conf
*/* test
END
- cat <<END > root/${SYSCONFDIR}/paludis${a}/bashrc
+ cat <<END > root/${SYSCONFDIR}/paludis-${a}/bashrc
export CHOST="my-chost"
export USER_BASHRC_WAS_USED=yes
END
- cat <<END > root/${SYSCONFDIR}/paludis${a}/repositories/repo1.conf
+ cat <<END > root/${SYSCONFDIR}/paludis-${a}/repositories/repo1.conf
location = `pwd`/repo1
cache = /var/empty
format = ebuild
@@ -48,7 +48,7 @@ END
done
-cat <<END > root/${SYSCONFDIR}/paludisvdb/repositories/installed.conf
+cat <<END > root/${SYSCONFDIR}/paludis-vdb/repositories/installed.conf
location = \${ROOT}/var/db/pkg
format = vdb
names_cache = /var/empty
@@ -56,7 +56,7 @@ provides_cache = /var/empty
buildroot = `pwd`/build
END
-cat <<END > root/${SYSCONFDIR}/paludisexndbam/repositories/installed.conf
+cat <<END > root/${SYSCONFDIR}/paludis-exndbam/repositories/installed.conf
location = \${ROOT}/var/db/exndbam
format = exndbam
buildroot = `pwd`/build