diff -r c9c90315ea24 -r 94d7459828ba test/named-root.sh --- a/test/named-root.sh Wed Apr 22 15:09:17 2009 +0100 +++ b/test/named-root.sh Thu Nov 13 10:44:53 2014 +0000 @@ -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 @@ 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"