diff -r bae5adee8c8c -r 644b648173b0 test/mult-install.sh --- a/test/mult-install.sh Fri Oct 17 09:57:19 2014 +0100 +++ b/test/mult-install.sh Thu Jul 14 11:43:16 2016 +0100 @@ -6,37 +6,37 @@ fi fs_check_file() { - if [ ! -e "$RAZOR_ROOT$1" ]; then + if [ ! -e "$tmpdir$1" ]; then echo $1: Not in filesystem >&2 - ls -R "$RAZOR_ROOT" >&2 + ls -R "$tmpdir" >&2 exit 1 fi } fs_check_file_contents() { fs_check_file "$1" - if [ `cat "$RAZOR_ROOT$1"` != "$2" ]; then + if [ `cat "$tmpdir$1"` != "$2" ]; then echo $1: Unexpected contents >&2 - cat "$RAZOR_ROOT$1" >&2 + cat "$tmpdir$1" >&2 exit 1 fi } fs_check_no_file() { - if [ -e "$RAZOR_ROOT$1" ]; then + if [ -e "$tmpdir$1" ]; then echo $1: Still in filesystem >&2 exit 1 fi } check_file() { - $razor list-files | grep -x "$1" > /dev/null + $razor list-files | grep -F -x "$1" > /dev/null if [ $? -ne 0 ]; then echo $1: Not in database >&2 $razor list-files >&2 exit 1 fi - $razor list-files "$1" | grep -x "$1" > /dev/null + $razor list-files "$1" | grep -F -x "$1" > /dev/null if [ $? -ne 0 ]; then echo $1: Not seen by patterned list >&2 $razor list-files "$1" >&2 @@ -50,7 +50,7 @@ fi for nevra in "$pkgs"; do name=`echo $nevra | sed 's/\-.*$//'` - $razor list-package-files "$name" | grep -x "$1" > /dev/null + $razor list-package-files "$name" | grep -F -x "$1" > /dev/null if [ $? -ne 0 ]; then echo $1: Not in database for package $name >&2 $razor list-package-files "$name" @@ -61,7 +61,7 @@ } check_no_file() { - $razor list-files | grep -x "$1" > /dev/null + $razor list-files | grep -F -x "$1" > /dev/null if [ $? -eq 0 ]; then echo $1: Still in database >&2 exit 1 @@ -76,9 +76,10 @@ exit 1 fi } -export RAZOR_ROOT=`mktemp -dt` || exit 1 +tmpdir=`mktemp -dt` || exit 1 +export RAZOR_ROOT="file:$tmpdir" $razor init || exit 1 -export YUM_URL="file://localhost/`pwd`" +export YUM_URL="file:`pwd`/base" $razor import-yum || exit 1 $razor install --relocate /usr=/opt zip || exit 1 fs_check_file_contents /opt/bin/zip zip-1-1 @@ -87,4 +88,4 @@ check_install_count zip 2 $razor install --relocate /usr=/opt zip || exit 1 check_install_count zip 3 -rm -rf "$RAZOR_ROOT" +rm -rf "$tmpdir"