test/named-root.sh
changeset 478 8e4bf84a7bb8
parent 456 bae5adee8c8c
     1.1 --- a/test/named-root.sh	Fri Oct 17 09:57:19 2014 +0100
     1.2 +++ b/test/named-root.sh	Thu Jul 07 11:04:10 2016 +0100
     1.3 @@ -6,19 +6,19 @@
     1.4  fi
     1.5  check_file()
     1.6  {
     1.7 -    $razor list-files | grep -x "$1" > /dev/null
     1.8 +    $razor list-files | grep -F -x "$1" > /dev/null
     1.9      if [ $? -ne 0 ]; then
    1.10  	echo $1: Not in database >&2
    1.11  	$razor list-files >&2
    1.12  	exit 1
    1.13      fi
    1.14 -    $razor list-files c: | grep -x "$1" > /dev/null
    1.15 +    $razor list-files c: | grep -F -x "$1" > /dev/null
    1.16      if [ $? -ne 0 ]; then
    1.17  	echo $1: Not seen by named root list >&2
    1.18  	$razor list-files c: >&2
    1.19  	exit 1
    1.20      fi
    1.21 -    $razor list-files "$1" | grep -x "$1" > /dev/null
    1.22 +    $razor list-files "$1" | grep -F -x "$1" > /dev/null
    1.23      if [ $? -ne 0 ]; then
    1.24  	echo $1: Not seen by patterned list >&2
    1.25  	$razor list-files "$1" >&2
    1.26 @@ -32,24 +32,23 @@
    1.27      fi
    1.28      for nevra in "$pkgs"; do
    1.29  	name=`echo $nevra | sed 's/\-.*$//'`
    1.30 -	$razor list-package-files "$name" | grep -x "$1" > /dev/null
    1.31 +	$razor list-package-files "$name" | grep -F -x "$1" > /dev/null
    1.32  	if [ $? -ne 0 ]; then
    1.33  	    echo $1: Not in database for package $name >&2
    1.34  	    $razor list-package-files "$name"
    1.35  	    exit 1
    1.36  	fi
    1.37      done
    1.38 -    if [ ! -e "$RAZOR_ROOT$1" ]; then 
    1.39 +    if [ ! -e "$tmpdir/$1" ]; then 
    1.40  	echo $1: Not in filesystem >&2
    1.41  	exit 1
    1.42      fi
    1.43  }
    1.44  tmpdir=`mktemp -dt` || exit 1
    1.45 -export RAZOR_ROOT="$tmpdir/x-"
    1.46 -mkdir -p "$tmpdir/x-/var/lib" "$tmpdir/x-c:"
    1.47 +export RAZOR_ROOT="file:$tmpdir"
    1.48  export RAZOR_NO_ROOT_NAME_CHECKS=1
    1.49  $razor init || exit 1
    1.50 -export YUM_URL="file://localhost/`pwd`"
    1.51 +export YUM_URL="file:`pwd`/base"
    1.52  $razor import-yum || exit 1
    1.53  $razor install --relocate /usr=c:/test zap || exit 1
    1.54  $razor install --relocate /usr=c:/test zip || exit 1