diff --git a/tests/xbps/libxbps/shell/ignore.sh b/tests/xbps/libxbps/shell/ignore.sh index 892c4f53..acf50f74 100644 --- a/tests/xbps/libxbps/shell/ignore.sh +++ b/tests/xbps/libxbps/shell/ignore.sh @@ -7,21 +7,21 @@ install_with_ignored_dep_head() { } install_with_ignored_dep_body() { - mkdir -p repo pkg_A pkg_B + mkdir -p repo root/xbps.d pkg_A pkg_B cd repo - xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A + xbps-create -A noarch -n A-1.0_1 -s "A pkg" -D "B-1.0_1" ../pkg_A atf_check_equal $? 0 xbps-create -A noarch -n B-1.0_1 -s "B pkg" ../pkg_B atf_check_equal $? 0 xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. - echo "ignorepkg=B" > ignore.conf - out=$(xbps-install -r root -C ignore.conf --repository=$PWD/repo -n A) + echo "ignorepkg=B" > root/xbps.d/ignore.conf + out=$(xbps-install -r root -C xbps.d --repository=$PWD/repo -n A) set -- $out exp="$1 $2 $3 $4" atf_check_equal "$exp" "A-1.0_1 install noarch $PWD/repo" - xbps-install -r root -C ignore.conf --repository=$PWD/repo -yd A + xbps-install -r root -C xbps.d --repository=$PWD/repo -yd A atf_check_equal $? 0 xbps-query -r root A atf_check_equal $? 0 @@ -36,32 +36,36 @@ update_with_ignored_dep_head() { } update_with_ignored_dep_body() { - mkdir -p repo pkg_A pkg_B + mkdir -p repo root/xbps.d pkg_A pkg_B cd repo - xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A + xbps-create -A noarch -n A-1.0_1 -s "A pkg" -D "B-1.0_1" ../pkg_A atf_check_equal $? 0 xbps-create -A noarch -n B-1.0_1 -s "B pkg" ../pkg_B atf_check_equal $? 0 xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. - echo "ignorepkg=B" > ignore.conf - xbps-install -r root -C ignore.conf --repository=$PWD/repo -yd A + echo "ignorepkg=B" > root/xbps.d/ignore.conf + xbps-install -r root -C xbps.d --repository=$PWD/repo -yd A atf_check_equal $? 0 + xbps-query -r root B + atf_check_equal $? 2 cd repo - xbps-create -A noarch -n A-1.1_1 -s "A pkg" ../pkg_A + xbps-create -A noarch -n A-1.1_1 -s "A pkg" -D "B-1.0_1" ../pkg_A atf_check_equal $? 0 xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. - out=$(xbps-install -r root -C ignore.conf --repository=$PWD/repo -un) + out=$(xbps-install -r root -C xbps.d --repository=$PWD/repo -un) set -- $out exp="$1 $2 $3 $4" atf_check_equal "$exp" "A-1.1_1 update noarch $PWD/repo" - xbps-install -r root --repository=$PWD/repo -yuvd + xbps-install -r root -C xbps.d --repository=$PWD/repo -yuvd atf_check_equal $? 0 out=$(xbps-query -r root -p pkgver A) atf_check_equal $out A-1.1_1 + xbps-query -r root B + atf_check_equal $? 2 } atf_init_test_cases() {