diff -r 4aac72ec4537 -r e1b95d57dd54 test/mult-install.sh --- a/test/mult-install.sh Thu Oct 01 20:02:23 2009 +0100 +++ b/test/mult-install.sh Tue Nov 11 15:57:14 2014 +0000 @@ -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 @@ } 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_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_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"