diff -r d7eea3164151 -r 5549419824b4 test/remove.sh
--- a/test/remove.sh	Thu Jul 02 11:31:45 2009 +0100
+++ b/test/remove.sh	Wed Jul 08 22:14:16 2009 +0100
@@ -58,20 +58,20 @@
 ../src/razor init || exit 1
 export YUM_URL="file://localhost/`pwd`"
 ../src/razor import-yum || exit 1
-../src/razor install zip || exit 1
-fs_check_file /usr/var/lib/zip/data.zap
+../src/razor install --relocate /usr=/opt zip || exit 1
+fs_check_file /opt/var/lib/zip/data.zap
 ../src/razor remove zip || exit 1
-check_file /usr/bin/zap
-check_no_file /usr/bin/zip
-fs_check_no_file /usr/var/lib/zip/data.zap
-../src/razor install zsh || exit 1
-../src/razor install zsh2 || exit 1
+check_file /opt/bin/zap
+check_no_file /opt/bin/zip
+fs_check_no_file /opt/var/lib/zip/data.zap
+../src/razor install --relocate /usr=/opt zsh || exit 1
+../src/razor install --relocate /usr=/opt zsh2 || exit 1
 ../src/razor remove zsh || exit 1
 check_file /etc/zsh.conf
-check_no_file /usr/bin/zsh
-../src/razor install zsh2 || exit 1
-../src/razor install zsh2 || exit 1
-fs_check_file /usr/var/lib/zip/data.zap
+check_no_file /opt/bin/zsh
+check_no_file /opt/var/lib/zsh/data.zip
+../src/razor install --relocate /usr=/opt zsh2 || exit 1
+fs_check_file /opt/var/lib/zip/data.zap
 ../src/razor remove zsh2 zip || exit 1
-fs_check_no_file /usr/var/lib/zip/data.zap
+fs_check_no_file /opt/var/lib/zip/data.zap
 rm -rf "$RAZOR_ROOT"