diff -r 6c691def7607 -r bad1547191dc test/remove.sh
--- a/test/remove.sh	Wed Feb 01 12:46:39 2012 +0000
+++ b/test/remove.sh	Thu Apr 14 11:59:56 2016 +0100
@@ -1,4 +1,9 @@
 #!/bin/sh
+if [ $# -gt 0 ]; then
+    razor="$1"
+else
+    razor=../src/razor
+fi
 fs_check_file()
 {
     if [ ! -e "$RAZOR_ROOT$1" ]; then 
@@ -16,30 +21,30 @@
 }
 check_file()
 {
-    ../src/razor list-files | grep -x "$1" > /dev/null
+    $razor list-files | grep -x "$1" > /dev/null
     if [ $? -ne 0 ]; then
 	echo $1: Not in database >&2
-	../src/razor list-files >&2
+	$razor list-files >&2
 	exit 1
     fi
-    ../src/razor list-files "$1" | grep -x "$1" > /dev/null
+    $razor list-files "$1" | grep -x "$1" > /dev/null
     if [ $? -ne 0 ]; then
 	echo $1: Not seen by patterned list >&2
-	../src/razor list-files "$1" >&2
+	$razor list-files "$1" >&2
 	exit 1
     fi
-    pkgs=`../src/razor list-file-packages "$1"`
+    pkgs=`$razor list-file-packages "$1"`
     if [ -z "$pkgs" ]; then
 	echo $1: Not owned by any package >&2
-	../src/razor list-file-packages "$1"
+	$razor list-file-packages "$1"
 	exit 1
     fi
     for nevra in "$pkgs"; do
 	name=`echo $nevra | sed 's/\-.*$//'`
-	../src/razor list-package-files "$name" | grep -x "$1" > /dev/null
+	$razor list-package-files "$name" | grep -x "$1" > /dev/null
 	if [ $? -ne 0 ]; then
 	    echo $1: Not in database for package $name >&2
-	    ../src/razor list-package-files "$name"
+	    $razor list-package-files "$name"
 	    exit 1
 	fi
     done
@@ -47,7 +52,7 @@
 }
 check_no_file()
 {
-    ../src/razor list-files | grep -x "$1" > /dev/null
+    $razor list-files | grep -x "$1" > /dev/null
     if [ $? -eq 0 ]; then
 	echo $1: Still in database >&2
 	exit 1
@@ -55,25 +60,25 @@
     fs_check_no_file $1
 }
 export RAZOR_ROOT=`mktemp -dt` || exit 1
-../src/razor init || exit 1
+$razor init || exit 1
 export YUM_URL="file://localhost/`pwd`"
-../src/razor import-yum || exit 1
-../src/razor install --relocate /usr=/opt zip || exit 1
+$razor import-yum || exit 1
+$razor install --relocate /usr=/opt zip || exit 1
 fs_check_file /opt/var/lib/zip/data.zap
-../src/razor remove zip || exit 1
+$razor remove zip || 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
+$razor install --relocate /usr=/opt zsh || exit 1
+$razor install --relocate /usr=/opt zsh2 || exit 1
+$razor remove zsh || exit 1
 check_file /etc/zsh.conf
 check_no_file /opt/bin/zsh
 check_no_file /opt/var/lib/zsh/data.zip
 # Installing a package twice isn't handled very well at present
 # so just don't do it for now.
-#../src/razor install --relocate /usr=/opt zsh2 || exit 1
+#$razor install --relocate /usr=/opt zsh2 || exit 1
 fs_check_file /opt/var/lib/zip/data.zap
-../src/razor remove zsh2 zip || exit 1
+$razor remove zsh2 zip || exit 1
 fs_check_no_file /opt/var/lib/zip/data.zap
 rm -rf "$RAZOR_ROOT"