1.1 --- a/test/details.sh	Thu Oct 09 17:27:41 2014 +0100
     1.2 +++ b/test/details.sh	Fri Oct 17 09:57:19 2014 +0100
     1.3 @@ -1,9 +1,14 @@
     1.4  #!/bin/sh
     1.5 +if [ $# -gt 0 ]; then
     1.6 +    razor="$1"
     1.7 +else
     1.8 +    razor=../src/razor
     1.9 +fi
    1.10  export RAZOR_ROOT=`mktemp -dt` || exit 1
    1.11 -../src/razor init || exit 1
    1.12 +$razor init || exit 1
    1.13  export YUM_URL="file://localhost/`pwd`"
    1.14 -../src/razor import-yum || exit 1
    1.15 -../src/razor install zsh2 || exit 1
    1.16 -../src/razor info zsh2 > details.out || exit 1
    1.17 +$razor import-yum || exit 1
    1.18 +$razor install zsh2 || exit 1
    1.19 +$razor info zsh2 > details.out || exit 1
    1.20  diff -u $srcdir/details.ref details.out || exit 1
    1.21  rm -rf "$RAZOR_ROOT"

     2.1 --- a/test/lua.sh	Thu Oct 09 17:27:41 2014 +0100
     2.2 +++ b/test/lua.sh	Fri Oct 17 09:57:19 2014 +0100
     2.3 @@ -1,4 +1,9 @@
     2.4  #!/bin/sh
     2.5 +if [ $# -gt 0 ]; then
     2.6 +    razor="$1"
     2.7 +else
     2.8 +    razor=../src/razor
     2.9 +fi
    2.10  check_filesystem()
    2.11  {
    2.12      if [ ! -e "$RAZOR_ROOT$1" ]; then 
    2.13 @@ -16,10 +21,10 @@
    2.14      check_filesystem "$1"
    2.15  }
    2.16  export RAZOR_ROOT=`mktemp -dt` || exit 1
    2.17 -../src/razor init || exit 1
    2.18 +$razor init || exit 1
    2.19  export YUM_URL="file://localhost/`pwd`"
    2.20 -../src/razor import-yum || exit 1
    2.21 -../src/razor install filesystem || exit 1
    2.22 +$razor import-yum || exit 1
    2.23 +$razor install filesystem || exit 1
    2.24  check_file /etc
    2.25  check_file /usr/bin
    2.26  check_file /usr/lib

     3.1 --- a/test/mult-install.sh	Thu Oct 09 17:27:41 2014 +0100
     3.2 +++ b/test/mult-install.sh	Fri Oct 17 09:57:19 2014 +0100
     3.3 @@ -1,4 +1,9 @@
     3.4  #!/bin/sh
     3.5 +if [ $# -gt 0 ]; then
     3.6 +    razor="$1"
     3.7 +else
     3.8 +    razor=../src/razor
     3.9 +fi
    3.10  fs_check_file()
    3.11  {
    3.12      if [ ! -e "$RAZOR_ROOT$1" ]; then 
    3.13 @@ -25,30 +30,30 @@
    3.14  }
    3.15  check_file()
    3.16  {
    3.17 -    ../src/razor list-files | grep -x "$1" > /dev/null
    3.18 +    $razor list-files | grep -x "$1" > /dev/null
    3.19      if [ $? -ne 0 ]; then
    3.20  	echo $1: Not in database >&2
    3.21 -	../src/razor list-files >&2
    3.22 +	$razor list-files >&2
    3.23  	exit 1
    3.24      fi
    3.25 -    ../src/razor list-files "$1" | grep -x "$1" > /dev/null
    3.26 +    $razor list-files "$1" | grep -x "$1" > /dev/null
    3.27      if [ $? -ne 0 ]; then
    3.28  	echo $1: Not seen by patterned list >&2
    3.29 -	../src/razor list-files "$1" >&2
    3.30 +	$razor list-files "$1" >&2
    3.31  	exit 1
    3.32      fi
    3.33 -    pkgs=`../src/razor list-file-packages "$1"`
    3.34 +    pkgs=`$razor list-file-packages "$1"`
    3.35      if [ -z "$pkgs" ]; then
    3.36  	echo $1: Not owned by any package >&2
    3.37 -	../src/razor list-file-packages "$1"
    3.38 +	$razor list-file-packages "$1"
    3.39  	exit 1
    3.40      fi
    3.41      for nevra in "$pkgs"; do
    3.42  	name=`echo $nevra | sed 's/\-.*$//'`
    3.43 -	../src/razor list-package-files "$name" | grep -x "$1" > /dev/null
    3.44 +	$razor list-package-files "$name" | grep -x "$1" > /dev/null
    3.45  	if [ $? -ne 0 ]; then
    3.46  	    echo $1: Not in database for package $name >&2
    3.47 -	    ../src/razor list-package-files "$name"
    3.48 +	    $razor list-package-files "$name"
    3.49  	    exit 1
    3.50  	fi
    3.51      done
    3.52 @@ -56,7 +61,7 @@
    3.53  }
    3.54  check_no_file()
    3.55  {
    3.56 -    ../src/razor list-files | grep -x "$1" > /dev/null
    3.57 +    $razor list-files | grep -x "$1" > /dev/null
    3.58      if [ $? -eq 0 ]; then
    3.59  	echo $1: Still in database >&2
    3.60  	exit 1
    3.61 @@ -65,21 +70,21 @@
    3.62  }
    3.63  check_install_count()
    3.64  {
    3.65 -    count=`../src/razor list "$1" | wc -l`
    3.66 +    count=`$razor list "$1" | wc -l`
    3.67      if [ "$count" != "$2" ]; then
    3.68  	echo $1: Install count $count, should be $2 >&2
    3.69  	exit 1
    3.70      fi
    3.71  }
    3.72  export RAZOR_ROOT=`mktemp -dt` || exit 1
    3.73 -../src/razor init || exit 1
    3.74 +$razor init || exit 1
    3.75  export YUM_URL="file://localhost/`pwd`"
    3.76 -../src/razor import-yum || exit 1
    3.77 -../src/razor install --relocate /usr=/opt zip || exit 1
    3.78 +$razor import-yum || exit 1
    3.79 +$razor install --relocate /usr=/opt zip || exit 1
    3.80  fs_check_file_contents /opt/bin/zip zip-1-1
    3.81  fs_check_file /opt/var/lib/zip/data.zap
    3.82 -../src/razor install --relocate /usr=/opt zip || exit 1
    3.83 +$razor install --relocate /usr=/opt zip || exit 1
    3.84  check_install_count zip 2
    3.85 -../src/razor install --relocate /usr=/opt zip || exit 1
    3.86 +$razor install --relocate /usr=/opt zip || exit 1
    3.87  check_install_count zip 3
    3.88  rm -rf "$RAZOR_ROOT"

     4.1 --- a/test/named-root.sh	Thu Oct 09 17:27:41 2014 +0100
     4.2 +++ b/test/named-root.sh	Fri Oct 17 09:57:19 2014 +0100
     4.3 @@ -1,36 +1,41 @@
     4.4  #!/bin/sh
     4.5 +if [ $# -gt 0 ]; then
     4.6 +    razor="$1"
     4.7 +else
     4.8 +    razor=../src/razor
     4.9 +fi
    4.10  check_file()
    4.11  {
    4.12 -    ../src/razor list-files | grep -x "$1" > /dev/null
    4.13 +    $razor list-files | grep -x "$1" > /dev/null
    4.14      if [ $? -ne 0 ]; then
    4.15  	echo $1: Not in database >&2
    4.16 -	../src/razor list-files >&2
    4.17 +	$razor list-files >&2
    4.18  	exit 1
    4.19      fi
    4.20 -    ../src/razor list-files c: | grep -x "$1" > /dev/null
    4.21 +    $razor list-files c: | grep -x "$1" > /dev/null
    4.22      if [ $? -ne 0 ]; then
    4.23  	echo $1: Not seen by named root list >&2
    4.24 -	../src/razor list-files c: >&2
    4.25 +	$razor list-files c: >&2
    4.26  	exit 1
    4.27      fi
    4.28 -    ../src/razor list-files "$1" | grep -x "$1" > /dev/null
    4.29 +    $razor list-files "$1" | grep -x "$1" > /dev/null
    4.30      if [ $? -ne 0 ]; then
    4.31  	echo $1: Not seen by patterned list >&2
    4.32 -	../src/razor list-files "$1" >&2
    4.33 +	$razor list-files "$1" >&2
    4.34  	exit 1
    4.35      fi
    4.36 -    pkgs=`../src/razor list-file-packages "$1"`
    4.37 +    pkgs=`$razor list-file-packages "$1"`
    4.38      if [ -z "$pkgs" ]; then
    4.39  	echo $1: Not owned by any package >&2
    4.40 -	../src/razor list-file-packages "$1"
    4.41 +	$razor list-file-packages "$1"
    4.42  	exit 1
    4.43      fi
    4.44      for nevra in "$pkgs"; do
    4.45  	name=`echo $nevra | sed 's/\-.*$//'`
    4.46 -	../src/razor list-package-files "$name" | grep -x "$1" > /dev/null
    4.47 +	$razor list-package-files "$name" | grep -x "$1" > /dev/null
    4.48  	if [ $? -ne 0 ]; then
    4.49  	    echo $1: Not in database for package $name >&2
    4.50 -	    ../src/razor list-package-files "$name"
    4.51 +	    $razor list-package-files "$name"
    4.52  	    exit 1
    4.53  	fi
    4.54      done
    4.55 @@ -43,11 +48,11 @@
    4.56  export RAZOR_ROOT="$tmpdir/x-"
    4.57  mkdir -p "$tmpdir/x-/var/lib" "$tmpdir/x-c:"
    4.58  export RAZOR_NO_ROOT_NAME_CHECKS=1
    4.59 -../src/razor init || exit 1
    4.60 +$razor init || exit 1
    4.61  export YUM_URL="file://localhost/`pwd`"
    4.62 -../src/razor import-yum || exit 1
    4.63 -../src/razor install --relocate /usr=c:/test zap || exit 1
    4.64 -../src/razor install --relocate /usr=c:/test zip || exit 1
    4.65 +$razor import-yum || exit 1
    4.66 +$razor install --relocate /usr=c:/test zap || exit 1
    4.67 +$razor install --relocate /usr=c:/test zip || exit 1
    4.68  check_file c:/test/bin/zap
    4.69  check_file c:/test/bin/zip
    4.70  rm -rf "$tmpdir"

     5.1 --- a/test/order.sh	Thu Oct 09 17:27:41 2014 +0100
     5.2 +++ b/test/order.sh	Fri Oct 17 09:57:19 2014 +0100
     5.3 @@ -1,4 +1,9 @@
     5.4  #!/bin/sh
     5.5 +if [ $# -gt 0 ]; then
     5.6 +    razor="$1"
     5.7 +else
     5.8 +    razor=../src/razor
     5.9 +fi
    5.10  check_file()
    5.11  {
    5.12      if [ ! -e "$RAZOR_ROOT$1" ]; then 
    5.13 @@ -7,10 +12,10 @@
    5.14      fi
    5.15  }
    5.16  export RAZOR_ROOT=`mktemp -dt` || exit 1
    5.17 -../src/razor init || exit 1
    5.18 +$razor init || exit 1
    5.19  export YUM_URL="file://localhost/`pwd`"
    5.20 -../src/razor import-yum || exit 1
    5.21 -../src/razor install zip zsh || exit 1
    5.22 +$razor import-yum || exit 1
    5.23 +$razor install zip zsh || exit 1
    5.24  check_file /usr/var/lib/zip/data.zap
    5.25  check_file /usr/var/lib/zsh/data.zip
    5.26  rm -rf "$RAZOR_ROOT"

     6.1 --- a/test/relocate.sh	Thu Oct 09 17:27:41 2014 +0100
     6.2 +++ b/test/relocate.sh	Fri Oct 17 09:57:19 2014 +0100
     6.3 @@ -1,7 +1,12 @@
     6.4  #!/bin/sh
     6.5 +if [ $# -gt 0 ]; then
     6.6 +    razor="$1"
     6.7 +else
     6.8 +    razor=../src/razor
     6.9 +fi
    6.10  check_file()
    6.11  {
    6.12 -    ../src/razor list-files | grep -x "$1" > /dev/null
    6.13 +    $razor list-files | grep -x "$1" > /dev/null
    6.14      if [ $? -ne 0 ]; then
    6.15  	echo $1: Not in database >&2
    6.16  	exit 1
    6.17 @@ -12,11 +17,11 @@
    6.18      fi
    6.19  }
    6.20  export RAZOR_ROOT=`mktemp -dt` || exit 1
    6.21 -../src/razor init || exit 1
    6.22 +$razor init || exit 1
    6.23  export YUM_URL="file://localhost/`pwd`"
    6.24 -../src/razor import-yum || exit 1
    6.25 -../src/razor install zap || exit 1
    6.26 -../src/razor install --relocate /usr=/opt --relocate /etc=/opt/etc zsh || exit 1
    6.27 +$razor import-yum || exit 1
    6.28 +$razor install zap || exit 1
    6.29 +$razor install --relocate /usr=/opt --relocate /etc=/opt/etc zsh || exit 1
    6.30  check_file /etc/zsh.conf
    6.31  check_file /usr/bin/zap
    6.32  check_file /opt/bin/zip

     7.1 --- a/test/remove.sh	Thu Oct 09 17:27:41 2014 +0100
     7.2 +++ b/test/remove.sh	Fri Oct 17 09:57:19 2014 +0100
     7.3 @@ -1,4 +1,9 @@
     7.4  #!/bin/sh
     7.5 +if [ $# -gt 0 ]; then
     7.6 +    razor="$1"
     7.7 +else
     7.8 +    razor=../src/razor
     7.9 +fi
    7.10  fs_check_file()
    7.11  {
    7.12      if [ ! -e "$RAZOR_ROOT$1" ]; then 
    7.13 @@ -16,30 +21,30 @@
    7.14  }
    7.15  check_file()
    7.16  {
    7.17 -    ../src/razor list-files | grep -x "$1" > /dev/null
    7.18 +    $razor list-files | grep -x "$1" > /dev/null
    7.19      if [ $? -ne 0 ]; then
    7.20  	echo $1: Not in database >&2
    7.21 -	../src/razor list-files >&2
    7.22 +	$razor list-files >&2
    7.23  	exit 1
    7.24      fi
    7.25 -    ../src/razor list-files "$1" | grep -x "$1" > /dev/null
    7.26 +    $razor list-files "$1" | grep -x "$1" > /dev/null
    7.27      if [ $? -ne 0 ]; then
    7.28  	echo $1: Not seen by patterned list >&2
    7.29 -	../src/razor list-files "$1" >&2
    7.30 +	$razor list-files "$1" >&2
    7.31  	exit 1
    7.32      fi
    7.33 -    pkgs=`../src/razor list-file-packages "$1"`
    7.34 +    pkgs=`$razor list-file-packages "$1"`
    7.35      if [ -z "$pkgs" ]; then
    7.36  	echo $1: Not owned by any package >&2
    7.37 -	../src/razor list-file-packages "$1"
    7.38 +	$razor list-file-packages "$1"
    7.39  	exit 1
    7.40      fi
    7.41      for nevra in "$pkgs"; do
    7.42  	name=`echo $nevra | sed 's/\-.*$//'`
    7.43 -	../src/razor list-package-files "$name" | grep -x "$1" > /dev/null
    7.44 +	$razor list-package-files "$name" | grep -x "$1" > /dev/null
    7.45  	if [ $? -ne 0 ]; then
    7.46  	    echo $1: Not in database for package $name >&2
    7.47 -	    ../src/razor list-package-files "$name"
    7.48 +	    $razor list-package-files "$name"
    7.49  	    exit 1
    7.50  	fi
    7.51      done
    7.52 @@ -47,7 +52,7 @@
    7.53  }
    7.54  check_no_file()
    7.55  {
    7.56 -    ../src/razor list-files | grep -x "$1" > /dev/null
    7.57 +    $razor list-files | grep -x "$1" > /dev/null
    7.58      if [ $? -eq 0 ]; then
    7.59  	echo $1: Still in database >&2
    7.60  	exit 1
    7.61 @@ -55,25 +60,25 @@
    7.62      fs_check_no_file $1
    7.63  }
    7.64  export RAZOR_ROOT=`mktemp -dt` || exit 1
    7.65 -../src/razor init || exit 1
    7.66 +$razor init || exit 1
    7.67  export YUM_URL="file://localhost/`pwd`"
    7.68 -../src/razor import-yum || exit 1
    7.69 -../src/razor install --relocate /usr=/opt zip || exit 1
    7.70 +$razor import-yum || exit 1
    7.71 +$razor install --relocate /usr=/opt zip || exit 1
    7.72  fs_check_file /opt/var/lib/zip/data.zap
    7.73 -../src/razor remove zip || exit 1
    7.74 +$razor remove zip || exit 1
    7.75  check_file /opt/bin/zap
    7.76  check_no_file /opt/bin/zip
    7.77  fs_check_no_file /opt/var/lib/zip/data.zap
    7.78 -../src/razor install --relocate /usr=/opt zsh || exit 1
    7.79 -../src/razor install --relocate /usr=/opt zsh2 || exit 1
    7.80 -../src/razor remove zsh || exit 1
    7.81 +$razor install --relocate /usr=/opt zsh || exit 1
    7.82 +$razor install --relocate /usr=/opt zsh2 || exit 1
    7.83 +$razor remove zsh || exit 1
    7.84  check_file /etc/zsh.conf
    7.85  check_no_file /opt/bin/zsh
    7.86  check_no_file /opt/var/lib/zsh/data.zip
    7.87  # Installing a package twice isn't handled very well at present
    7.88  # so just don't do it for now.
    7.89 -#../src/razor install --relocate /usr=/opt zsh2 || exit 1
    7.90 +#$razor install --relocate /usr=/opt zsh2 || exit 1
    7.91  fs_check_file /opt/var/lib/zip/data.zap
    7.92 -../src/razor remove zsh2 zip || exit 1
    7.93 +$razor remove zsh2 zip || exit 1
    7.94  fs_check_no_file /opt/var/lib/zip/data.zap
    7.95  rm -rf "$RAZOR_ROOT"

     8.1 --- a/test/update.sh	Thu Oct 09 17:27:41 2014 +0100
     8.2 +++ b/test/update.sh	Fri Oct 17 09:57:19 2014 +0100
     8.3 @@ -1,4 +1,9 @@
     8.4  #!/bin/sh
     8.5 +if [ $# -gt 0 ]; then
     8.6 +    razor="$1"
     8.7 +else
     8.8 +    razor=../src/razor
     8.9 +fi
    8.10  fs_check_file()
    8.11  {
    8.12      if [ ! -e "$RAZOR_ROOT$1" ]; then 
    8.13 @@ -25,30 +30,30 @@
    8.14  }
    8.15  check_file()
    8.16  {
    8.17 -    ../src/razor list-files | grep -x "$1" > /dev/null
    8.18 +    $razor list-files | grep -x "$1" > /dev/null
    8.19      if [ $? -ne 0 ]; then
    8.20  	echo $1: Not in database >&2
    8.21 -	../src/razor list-files >&2
    8.22 +	$razor list-files >&2
    8.23  	exit 1
    8.24      fi
    8.25 -    ../src/razor list-files "$1" | grep -x "$1" > /dev/null
    8.26 +    $razor list-files "$1" | grep -x "$1" > /dev/null
    8.27      if [ $? -ne 0 ]; then
    8.28  	echo $1: Not seen by patterned list >&2
    8.29 -	../src/razor list-files "$1" >&2
    8.30 +	$razor list-files "$1" >&2
    8.31  	exit 1
    8.32      fi
    8.33 -    pkgs=`../src/razor list-file-packages "$1"`
    8.34 +    pkgs=`$razor list-file-packages "$1"`
    8.35      if [ -z "$pkgs" ]; then
    8.36  	echo $1: Not owned by any package >&2
    8.37 -	../src/razor list-file-packages "$1"
    8.38 +	$razor list-file-packages "$1"
    8.39  	exit 1
    8.40      fi
    8.41      for nevra in "$pkgs"; do
    8.42  	name=`echo $nevra | sed 's/\-.*$//'`
    8.43 -	../src/razor list-package-files "$name" | grep -x "$1" > /dev/null
    8.44 +	$razor list-package-files "$name" | grep -x "$1" > /dev/null
    8.45  	if [ $? -ne 0 ]; then
    8.46  	    echo $1: Not in database for package $name >&2
    8.47 -	    ../src/razor list-package-files "$name"
    8.48 +	    $razor list-package-files "$name"
    8.49  	    exit 1
    8.50  	fi
    8.51      done
    8.52 @@ -56,7 +61,7 @@
    8.53  }
    8.54  check_no_file()
    8.55  {
    8.56 -    ../src/razor list-files | grep -x "$1" > /dev/null
    8.57 +    $razor list-files | grep -x "$1" > /dev/null
    8.58      if [ $? -eq 0 ]; then
    8.59  	echo $1: Still in database >&2
    8.60  	exit 1
    8.61 @@ -65,7 +70,7 @@
    8.62  }
    8.63  check_install_count()
    8.64  {
    8.65 -    count=`../src/razor list "$1" | wc -l`
    8.66 +    count=`$razor list "$1" | wc -l`
    8.67      if [ "$count" != "$2" ]; then
    8.68  	echo $1: Install count $count, should be $2 >&2
    8.69  	exit 1
    8.70 @@ -78,39 +83,39 @@
    8.71      ln -s $1/rpms .
    8.72  }
    8.73  export RAZOR_ROOT=`mktemp -dt` || exit 1
    8.74 -../src/razor init || exit 1
    8.75 +$razor init || exit 1
    8.76  export YUM_URL="file://localhost/`pwd`"
    8.77  set_repository base
    8.78 -../src/razor import-yum || exit 1
    8.79 -../src/razor install --relocate /usr=/opt zip || exit 1
    8.80 +$razor import-yum || exit 1
    8.81 +$razor install --relocate /usr=/opt zip || exit 1
    8.82  fs_check_file_contents /opt/bin/zip zip-1-1
    8.83  fs_check_file /opt/var/lib/zip/data.zap
    8.84  trap "set_repository base" 0
    8.85  set_repository updates
    8.86 -../src/razor import-yum || exit 1
    8.87 -../src/razor update --relocate /usr=/opt || exit 1
    8.88 +$razor import-yum || exit 1
    8.89 +$razor update --relocate /usr=/opt || exit 1
    8.90  check_file /opt/bin/zip
    8.91  fs_check_file_contents /opt/bin/zip zip-2-1
    8.92  fs_check_file /opt/var/lib/zip/data.zap
    8.93 -../src/razor remove zip || exit 1
    8.94 +$razor remove zip || exit 1
    8.95  fs_check_no_file /opt/var/lib/zip/data.zap
    8.96  set_repository base
    8.97 -../src/razor import-yum || exit 1
    8.98 -../src/razor install --relocate /usr=/opt zip || exit 1
    8.99 -../src/razor install --relocate /usr=/opt zip || exit 1
   8.100 +$razor import-yum || exit 1
   8.101 +$razor install --relocate /usr=/opt zip || exit 1
   8.102 +$razor install --relocate /usr=/opt zip || exit 1
   8.103  check_install_count zip 2
   8.104  set_repository updates
   8.105 -../src/razor import-yum || exit 1
   8.106 -../src/razor update --relocate /usr=/opt || exit 1
   8.107 +$razor import-yum || exit 1
   8.108 +$razor update --relocate /usr=/opt || exit 1
   8.109  check_file /opt/bin/zip
   8.110  fs_check_file_contents /opt/bin/zip zip-2-1
   8.111  fs_check_file /opt/var/lib/zip/data.zap
   8.112  check_install_count zip 1
   8.113 -../src/razor remove zip || exit 1
   8.114 +$razor remove zip || exit 1
   8.115  fs_check_no_file /opt/var/lib/zip/data.zap
   8.116  set_repository base
   8.117 -../src/razor import-yum || exit 1
   8.118 -../src/razor install --relocate /usr=/opt zip || exit 1
   8.119 -../src/razor update --relocate /usr=/opt zip || exit 1
   8.120 +$razor import-yum || exit 1
   8.121 +$razor install --relocate /usr=/opt zip || exit 1
   8.122 +$razor update --relocate /usr=/opt zip || exit 1
   8.123  check_install_count zip 1
   8.124  rm -rf "$RAZOR_ROOT"