From 6215d3c24b90cbf0626bea3565236fcf2a8c38ac Mon Sep 17 00:00:00 2001
From: J. Ali Harlow <ali@juiblex.co.uk>
Date: Fri, 17 Oct 2014 09:57:19 +0100
Subject: [PATCH] Add facility to specify razor command when running tests.

This makes it easy to run under eg., valgrind as:

./details "libtool --mode=execute valgrind --leak-check=yes ../src/razor"
---
 test/details.sh      |   13 ++++++++---
 test/lua.sh          |   11 +++++++--
 test/mult-install.sh |   35 ++++++++++++++++++-------------
 test/named-root.sh   |   33 +++++++++++++++++------------
 test/order.sh        |   11 +++++++--
 test/relocate.sh     |   15 +++++++++----
 test/remove.sh       |   41 ++++++++++++++++++++----------------
 test/update.sh       |   55 +++++++++++++++++++++++++++----------------------
 8 files changed, 127 insertions(+), 87 deletions(-)

diff --git a/test/details.sh b/test/details.sh
index 9c6207c..3f74b32 100755
--- a/test/details.sh
+++ b/test/details.sh
@@ -1,9 +1,14 @@
 #!/bin/sh
+if [ $# -gt 0 ]; then
+    razor="$1"
+else
+    razor=../src/razor
+fi
 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 zsh2 || exit 1
-../src/razor info zsh2 > details.out || exit 1
+$razor import-yum || exit 1
+$razor install zsh2 || exit 1
+$razor info zsh2 > details.out || exit 1
 diff -u $srcdir/details.ref details.out || exit 1
 rm -rf "$RAZOR_ROOT"
diff --git a/test/lua.sh b/test/lua.sh
index 2c3a084..3b0d020 100755
--- a/test/lua.sh
+++ b/test/lua.sh
@@ -1,4 +1,9 @@
 #!/bin/sh
+if [ $# -gt 0 ]; then
+    razor="$1"
+else
+    razor=../src/razor
+fi
 check_filesystem()
 {
     if [ ! -e "$RAZOR_ROOT$1" ]; then 
@@ -16,10 +21,10 @@ check_file()
     check_filesystem "$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 filesystem || exit 1
+$razor import-yum || exit 1
+$razor install filesystem || exit 1
 check_file /etc
 check_file /usr/bin
 check_file /usr/lib
diff --git a/test/mult-install.sh b/test/mult-install.sh
index a17ac4f..4266ad0 100755
--- a/test/mult-install.sh
+++ b/test/mult-install.sh
@@ -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 
@@ -25,30 +30,30 @@ fs_check_no_file()
 }
 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
@@ -56,7 +61,7 @@ check_file()
 }
 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
@@ -65,21 +70,21 @@ check_no_file()
 }
 check_install_count()
 {
-    count=`../src/razor list "$1" | wc -l`
+    count=`$razor list "$1" | wc -l`
     if [ "$count" != "$2" ]; then
 	echo $1: Install count $count, should be $2 >&2
 	exit 1
     fi
 }
 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_contents /opt/bin/zip zip-1-1
 fs_check_file /opt/var/lib/zip/data.zap
-../src/razor install --relocate /usr=/opt zip || exit 1
+$razor install --relocate /usr=/opt zip || exit 1
 check_install_count zip 2
-../src/razor install --relocate /usr=/opt zip || exit 1
+$razor install --relocate /usr=/opt zip || exit 1
 check_install_count zip 3
 rm -rf "$RAZOR_ROOT"
diff --git a/test/named-root.sh b/test/named-root.sh
index f85f42f..00fa7d2 100755
--- a/test/named-root.sh
+++ b/test/named-root.sh
@@ -1,36 +1,41 @@
 #!/bin/sh
+if [ $# -gt 0 ]; then
+    razor="$1"
+else
+    razor=../src/razor
+fi
 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 c: | grep -x "$1" > /dev/null
+    $razor list-files c: | grep -x "$1" > /dev/null
     if [ $? -ne 0 ]; then
 	echo $1: Not seen by named root list >&2
-	../src/razor list-files c: >&2
+	$razor list-files c: >&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
@@ -43,11 +48,11 @@ tmpdir=`mktemp -dt` || exit 1
 export RAZOR_ROOT="$tmpdir/x-"
 mkdir -p "$tmpdir/x-/var/lib" "$tmpdir/x-c:"
 export RAZOR_NO_ROOT_NAME_CHECKS=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=c:/test zap || exit 1
-../src/razor install --relocate /usr=c:/test zip || exit 1
+$razor import-yum || exit 1
+$razor install --relocate /usr=c:/test zap || exit 1
+$razor install --relocate /usr=c:/test zip || exit 1
 check_file c:/test/bin/zap
 check_file c:/test/bin/zip
 rm -rf "$tmpdir"
diff --git a/test/order.sh b/test/order.sh
index 07441fa..3ed1a00 100755
--- a/test/order.sh
+++ b/test/order.sh
@@ -1,4 +1,9 @@
 #!/bin/sh
+if [ $# -gt 0 ]; then
+    razor="$1"
+else
+    razor=../src/razor
+fi
 check_file()
 {
     if [ ! -e "$RAZOR_ROOT$1" ]; then 
@@ -7,10 +12,10 @@ check_file()
     fi
 }
 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 zip zsh || exit 1
+$razor import-yum || exit 1
+$razor install zip zsh || exit 1
 check_file /usr/var/lib/zip/data.zap
 check_file /usr/var/lib/zsh/data.zip
 rm -rf "$RAZOR_ROOT"
diff --git a/test/relocate.sh b/test/relocate.sh
index ee7a45e..576c69f 100755
--- a/test/relocate.sh
+++ b/test/relocate.sh
@@ -1,7 +1,12 @@
 #!/bin/sh
+if [ $# -gt 0 ]; then
+    razor="$1"
+else
+    razor=../src/razor
+fi
 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
 	exit 1
@@ -12,11 +17,11 @@ check_file()
     fi
 }
 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 zap || exit 1
-../src/razor install --relocate /usr=/opt --relocate /etc=/opt/etc zsh || exit 1
+$razor import-yum || exit 1
+$razor install zap || exit 1
+$razor install --relocate /usr=/opt --relocate /etc=/opt/etc zsh || exit 1
 check_file /etc/zsh.conf
 check_file /usr/bin/zap
 check_file /opt/bin/zip
diff --git a/test/remove.sh b/test/remove.sh
index fc85a13..6ba8795 100755
--- a/test/remove.sh
+++ b/test/remove.sh
@@ -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 @@ fs_check_no_file()
 }
 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_file()
 }
 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 @@ check_no_file()
     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"
diff --git a/test/update.sh b/test/update.sh
index 0b74bed..9a80aec 100755
--- a/test/update.sh
+++ b/test/update.sh
@@ -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 
@@ -25,30 +30,30 @@ fs_check_no_file()
 }
 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
@@ -56,7 +61,7 @@ check_file()
 }
 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
@@ -65,7 +70,7 @@ check_no_file()
 }
 check_install_count()
 {
-    count=`../src/razor list "$1" | wc -l`
+    count=`$razor list "$1" | wc -l`
     if [ "$count" != "$2" ]; then
 	echo $1: Install count $count, should be $2 >&2
 	exit 1
@@ -78,39 +83,39 @@ set_repository()
     ln -s $1/rpms .
 }
 export RAZOR_ROOT=`mktemp -dt` || exit 1
-../src/razor init || exit 1
+$razor init || exit 1
 export YUM_URL="file://localhost/`pwd`"
 set_repository base
-../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_contents /opt/bin/zip zip-1-1
 fs_check_file /opt/var/lib/zip/data.zap
 trap "set_repository base" 0
 set_repository updates
-../src/razor import-yum || exit 1
-../src/razor update --relocate /usr=/opt || exit 1
+$razor import-yum || exit 1
+$razor update --relocate /usr=/opt || exit 1
 check_file /opt/bin/zip
 fs_check_file_contents /opt/bin/zip zip-2-1
 fs_check_file /opt/var/lib/zip/data.zap
-../src/razor remove zip || exit 1
+$razor remove zip || exit 1
 fs_check_no_file /opt/var/lib/zip/data.zap
 set_repository base
-../src/razor import-yum || exit 1
-../src/razor install --relocate /usr=/opt zip || exit 1
-../src/razor install --relocate /usr=/opt zip || exit 1
+$razor import-yum || exit 1
+$razor install --relocate /usr=/opt zip || exit 1
+$razor install --relocate /usr=/opt zip || exit 1
 check_install_count zip 2
 set_repository updates
-../src/razor import-yum || exit 1
-../src/razor update --relocate /usr=/opt || exit 1
+$razor import-yum || exit 1
+$razor update --relocate /usr=/opt || exit 1
 check_file /opt/bin/zip
 fs_check_file_contents /opt/bin/zip zip-2-1
 fs_check_file /opt/var/lib/zip/data.zap
 check_install_count zip 1
-../src/razor remove zip || exit 1
+$razor remove zip || exit 1
 fs_check_no_file /opt/var/lib/zip/data.zap
 set_repository base
-../src/razor import-yum || exit 1
-../src/razor install --relocate /usr=/opt zip || exit 1
-../src/razor update --relocate /usr=/opt zip || exit 1
+$razor import-yum || exit 1
+$razor install --relocate /usr=/opt zip || exit 1
+$razor update --relocate /usr=/opt zip || exit 1
 check_install_count zip 1
 rm -rf "$RAZOR_ROOT"
-- 
1.7.1