From 759f7e7fbad56fb6d5dfddd7982d3551192b0468 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 6 Nov 2014 11:21:32 +0100 Subject: [PATCH] tests: use abs path to repodir in xbps-rindex. --- tests/xbps/libxbps/shell/conf_files_test.sh | 14 +++++++------- .../xbps/libxbps/shell/incorrect_deps_test.sh | 6 +++--- tests/xbps/libxbps/shell/install_test.sh | 18 +++++++++--------- tests/xbps/libxbps/shell/installmode_test.sh | 10 +++++----- tests/xbps/libxbps/shell/issue18_test.sh | 4 ++-- tests/xbps/libxbps/shell/issue20_test.sh | 4 ++-- tests/xbps/libxbps/shell/issue31_test.sh | 2 +- tests/xbps/libxbps/shell/issue6_test.sh | 4 ++-- tests/xbps/libxbps/shell/obsoletefiles_test.sh | 8 ++++---- .../xbps/libxbps/shell/preserve_files_test.sh | 4 ++-- tests/xbps/libxbps/shell/remove_test.sh | 14 +++++++------- tests/xbps/libxbps/shell/replace_test.sh | 10 +++++----- tests/xbps/libxbps/shell/scripts_test.sh | 4 ++-- tests/xbps/libxbps/shell/update_shlibs.sh | 16 ++++++++-------- tests/xbps/libxbps/shell/vpkg_test.sh | 8 ++++---- tests/xbps/xbps-checkvers/checkvers.sh | 6 +++--- tests/xbps/xbps-install/behaviour_tests.sh | 4 ++-- tests/xbps/xbps-install/revert_tests.sh | 6 +++--- tests/xbps/xbps-query/remote_test.sh | 2 +- tests/xbps/xbps-rindex/add_test.sh | 8 ++++---- tests/xbps/xbps-rindex/clean_test.sh | 10 +++++----- 21 files changed, 81 insertions(+), 81 deletions(-) diff --git a/tests/xbps/libxbps/shell/conf_files_test.sh b/tests/xbps/libxbps/shell/conf_files_test.sh index eec8c498..f9ef29fd 100644 --- a/tests/xbps/libxbps/shell/conf_files_test.sh +++ b/tests/xbps/libxbps/shell/conf_files_test.sh @@ -16,7 +16,7 @@ tc1_body() { xbps-create -A noarch -n a-0.1_1 -s "pkg a" --config-files "/cf1.conf" pkg_a atf_check_equal $? 0 rm -rf pkg_a - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 xbps-install -C null.conf -r rootdir --repository=$PWD -yvd a atf_check_equal $? 0 @@ -26,7 +26,7 @@ tc1_body() { echo "fooblah" > pkg_a/cf1.conf xbps-create -A noarch -n a-0.2_1 -s "pkg a" --config-files "/cf1.conf" pkg_a atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps rm -rf pkg_a atf_check_equal $? 0 xbps-install -C null.conf -r rootdir --repository=$PWD -yuvd @@ -56,7 +56,7 @@ tc2_body() { xbps-create -A noarch -n a-0.1_1 -s "pkg a" --config-files "/cf1.conf" pkg_a atf_check_equal $? 0 rm -rf pkg_a - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 xbps-install -C null.conf -r rootdir --repository=$PWD -yvd a atf_check_equal $? 0 @@ -68,7 +68,7 @@ tc2_body() { chmod 644 pkg_a/cf1.conf xbps-create -A noarch -n a-0.2_1 -s "pkg a" --config-files "/cf1.conf" pkg_a atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps rm -rf pkg_a atf_check_equal $? 0 xbps-install -C null.conf -r rootdir --repository=$PWD -yuvd @@ -105,7 +105,7 @@ tc3_body() { xbps-create -A noarch -n a-0.1_1 -s "pkg a" --config-files "/cf1.conf" pkg_a atf_check_equal $? 0 rm -rf pkg_a - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 xbps-install -C null.conf -r rootdir --repository=$PWD -yvd a atf_check_equal $? 0 @@ -117,7 +117,7 @@ tc3_body() { chmod 644 pkg_a/cf1.conf xbps-create -A noarch -n a-0.2_1 -s "pkg a" --config-files "/cf1.conf" pkg_a atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps rm -rf pkg_a atf_check_equal $? 0 xbps-install -C null.conf -r rootdir --repository=$PWD -yuvd @@ -147,7 +147,7 @@ tc4_body() { xbps-create -A noarch -n a-0.1_1 -s "pkg a" --config-files "/etc/cf1.conf" pkg_a atf_check_equal $? 0 rm -rf pkg_a - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 mkdir -p rootdir/etc diff --git a/tests/xbps/libxbps/shell/incorrect_deps_test.sh b/tests/xbps/libxbps/shell/incorrect_deps_test.sh index f11c7eee..a8913972 100644 --- a/tests/xbps/libxbps/shell/incorrect_deps_test.sh +++ b/tests/xbps/libxbps/shell/incorrect_deps_test.sh @@ -14,7 +14,7 @@ incorrect_dep_body() { xbps-create -A noarch -n B-1.0_1 -s "B pkg" --dependencies "B>=0" ../pkg_B atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -C empty.conf -r root --repository=$PWD/some_repo -dy B @@ -34,7 +34,7 @@ incorrect_dep_vpkg_body() { xbps-create -A noarch -n B-1.0_1 -s "B pkg" --dependencies "A>=7.11_1" --provides "A-331.67_1" ../pkg_B atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -C empty.conf -r root --repository=$PWD/some_repo -dy A @@ -58,7 +58,7 @@ incorrect_dep_issue45_body() { xbps-create -A noarch -n B-1.0_1 -s "B pkg" --dependencies "A>=0" ../pkg_B atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -C empty.conf -r root --repository=$PWD/some_repo -dy B diff --git a/tests/xbps/libxbps/shell/install_test.sh b/tests/xbps/libxbps/shell/install_test.sh index faa454c4..adaa1213 100644 --- a/tests/xbps/libxbps/shell/install_test.sh +++ b/tests/xbps/libxbps/shell/install_test.sh @@ -11,7 +11,7 @@ install_empty_body() { cd repo xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -C empty.conf -r root --repository=$PWD/repo -yd A @@ -43,7 +43,7 @@ install_with_deps_body() { xbps-create -A noarch -n D-1.0_1 -s "D pkg" --dependencies "C>=0 B>=0" ../pkg_D atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -76,7 +76,7 @@ install_with_vpkg_deps_body() { xbps-create -A noarch -n D-1.0_1 -s "D pkg" --dependencies "E>=0 B>=0" ../pkg_D atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -101,7 +101,7 @@ update_to_empty_pkg_body() { cd repo xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -112,7 +112,7 @@ update_to_empty_pkg_body() { rm -rf ../pkg_A/* xbps-create -A noarch -n A-1.1_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -138,7 +138,7 @@ update_if_installed_body() { xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -149,7 +149,7 @@ update_if_installed_body() { xbps-create -A noarch -n A-1.1_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -172,7 +172,7 @@ install_if_not_installed_on_update_body() { xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -196,7 +196,7 @@ install_dups_body() { xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. diff --git a/tests/xbps/libxbps/shell/installmode_test.sh b/tests/xbps/libxbps/shell/installmode_test.sh index 03c0d706..99dd9958 100644 --- a/tests/xbps/libxbps/shell/installmode_test.sh +++ b/tests/xbps/libxbps/shell/installmode_test.sh @@ -16,7 +16,7 @@ instmode_body() { atf_check_equal $? 0 xbps-create -A noarch -n b-1.0_1 -s "foo pkg" --dependencies "a>=0" ../pkg_b atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -49,7 +49,7 @@ instmode_auto_body() { atf_check_equal $? 0 xbps-create -A noarch -n b-1.0_1 -s "foo pkg" --dependencies "a>=0" ../pkg_b atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -77,7 +77,7 @@ instmode_update_body() { cd some_repo xbps-create -A noarch -n A-1.0_1 -s "foo pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -87,7 +87,7 @@ instmode_update_body() { cd some_repo xbps-create -A noarch -n A-1.1_1 -s "foo pkg" ../pkg_B atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -112,7 +112,7 @@ instmode_reinstall_body() { cd some_repo xbps-create -A noarch -n A-1.0_1 -s "foo pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -r root -C null.conf --repository=$PWD/some_repo -Ayd A-1.0_1 diff --git a/tests/xbps/libxbps/shell/issue18_test.sh b/tests/xbps/libxbps/shell/issue18_test.sh index c3b34e86..d227c683 100644 --- a/tests/xbps/libxbps/shell/issue18_test.sh +++ b/tests/xbps/libxbps/shell/issue18_test.sh @@ -20,7 +20,7 @@ issue18_body() { atf_check_equal $? 0 xbps-create -A noarch -n B-0.1_1 -s "pkg B" pkg_B atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 xbps-install -C null.conf -r rootdir --repository=$PWD -y A B atf_check_equal $? 0 @@ -29,7 +29,7 @@ issue18_body() { atf_check_equal $? 0 xbps-create -A noarch -n B-0.1_2 -s "pkg B" pkg_B atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 xbps-install -C null.conf -r rootdir --repository=$PWD -yu atf_check_equal $? 0 diff --git a/tests/xbps/libxbps/shell/issue20_test.sh b/tests/xbps/libxbps/shell/issue20_test.sh index 4e79f445..857993be 100644 --- a/tests/xbps/libxbps/shell/issue20_test.sh +++ b/tests/xbps/libxbps/shell/issue20_test.sh @@ -29,7 +29,7 @@ issue20_body() { xbps-create -A noarch -n a-0.1_1 -s "pkg a" pkg_a atf_check_equal $? 0 rm -rf pkg_a - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 xbps-install -C null.conf -r rootdir --repository=$PWD -yvd a atf_check_equal $? 0 @@ -40,7 +40,7 @@ issue20_body() { xbps-create -A noarch -n a-0.2_1 -s "pkg a" pkg_a atf_check_equal $? 0 rm -rf pkg_a - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 xbps-install -C null.conf -r rootdir --repository=$PWD -yuvd atf_check_equal $? 0 diff --git a/tests/xbps/libxbps/shell/issue31_test.sh b/tests/xbps/libxbps/shell/issue31_test.sh index b98e8e74..f777360e 100644 --- a/tests/xbps/libxbps/shell/issue31_test.sh +++ b/tests/xbps/libxbps/shell/issue31_test.sh @@ -20,7 +20,7 @@ issue31_body() { echo random > pkg_A/usr/share/licenses/chromium/license.html/eula.html xbps-create -A noarch -n A-0.1_1 -s "pkg A" pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 xbps-install -r root -C null.conf --repository=$PWD -y A diff --git a/tests/xbps/libxbps/shell/issue6_test.sh b/tests/xbps/libxbps/shell/issue6_test.sh index 91c298be..ff8dac14 100644 --- a/tests/xbps/libxbps/shell/issue6_test.sh +++ b/tests/xbps/libxbps/shell/issue6_test.sh @@ -22,7 +22,7 @@ issue6_body() { cd repo xbps-create -A noarch -n a-0.1_1 -s "pkg a" . atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 xbps-install -C null.conf -r rootdir --repository=$PWD -yvd a atf_check_equal $? 0 @@ -34,7 +34,7 @@ issue6_body() { xbps-create -A noarch -n a-0.2_1 -s "pkg a" pkg_a atf_check_equal $? 0 rm -rf pkg_a - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 xbps-install -C null.conf -r rootdir --repository=$PWD -yuvd atf_check_equal $? 0 diff --git a/tests/xbps/libxbps/shell/obsoletefiles_test.sh b/tests/xbps/libxbps/shell/obsoletefiles_test.sh index 6b64a025..f90183bd 100644 --- a/tests/xbps/libxbps/shell/obsoletefiles_test.sh +++ b/tests/xbps/libxbps/shell/obsoletefiles_test.sh @@ -20,7 +20,7 @@ reinstall_obsoletes_body() { cd some_repo xbps-create -A noarch -n A-1.1_1 -s "foo pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -31,7 +31,7 @@ reinstall_obsoletes_body() { cd some_repo xbps-create -A noarch -n A-1.0_1 -s "foo pkg" ../pkg_B atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -71,7 +71,7 @@ root_symlinks_update_body() { xbps-create -A noarch -n foo-1.0_1 -s "foo pkg" ../pkg_A atf_check_equal $? 0 rm -rf ../pkg_A - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 xbps-install -r root -C null.conf --repository=$PWD -yd foo @@ -85,7 +85,7 @@ root_symlinks_update_body() { xbps-create -A noarch -n foo-1.1_1 -s "foo pkg" ../pkg_A atf_check_equal $? 0 rm -rf ../pkg_A - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 xbps-install -r root -C null.conf --repository=$PWD -yuvd foo diff --git a/tests/xbps/libxbps/shell/preserve_files_test.sh b/tests/xbps/libxbps/shell/preserve_files_test.sh index 6936b251..bdfed2e8 100644 --- a/tests/xbps/libxbps/shell/preserve_files_test.sh +++ b/tests/xbps/libxbps/shell/preserve_files_test.sh @@ -14,7 +14,7 @@ tc1_body() { cd some_repo xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -49,7 +49,7 @@ tc2_body() { cd some_repo xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. diff --git a/tests/xbps/libxbps/shell/remove_test.sh b/tests/xbps/libxbps/shell/remove_test.sh index eab5832b..028a241a 100644 --- a/tests/xbps/libxbps/shell/remove_test.sh +++ b/tests/xbps/libxbps/shell/remove_test.sh @@ -25,7 +25,7 @@ keep_base_symlinks_body() { cd some_repo xbps-create -A noarch -n foo-1.0_1 -s "foo pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -r root -C null.conf --repository=$PWD/some_repo -y foo @@ -59,7 +59,7 @@ remove_symlinks_body() { atf_check_equal $? 0 xbps-create -A noarch -n B-1.0_1 --dependencies "A>=0" -s "B pkg" ../pkg_B atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -r root -C null.conf --repository=$PWD/some_repo -y B @@ -91,7 +91,7 @@ remove_symlinks_from_root_body() { cd some_repo xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -r root -C null.conf --repository=$PWD/some_repo -y A @@ -120,7 +120,7 @@ keep_modified_symlinks_body() { cd some_repo xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -r root -C null.conf --repository=$PWD/some_repo -y A @@ -152,7 +152,7 @@ remove_symlinks_modified_body() { cd some_repo xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -r root -C null.conf --repository=$PWD/some_repo -y A @@ -185,7 +185,7 @@ remove_readonly_files_body() { cd some_repo xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -r root -C null.conf --repository=$PWD/some_repo -yv A @@ -212,7 +212,7 @@ remove_dups_body() { cd some_repo xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -r root -C null.conf --repository=$PWD/some_repo -yv A diff --git a/tests/xbps/libxbps/shell/replace_test.sh b/tests/xbps/libxbps/shell/replace_test.sh index 0ec0d985..1970f424 100644 --- a/tests/xbps/libxbps/shell/replace_test.sh +++ b/tests/xbps/libxbps/shell/replace_test.sh @@ -25,7 +25,7 @@ replace_dups_body() { atf_check_equal $? 0 xbps-create -A noarch -n B-1.0_1 -s "B pkg" --replaces "A>=0 A>=0" ../pkg_B atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -C empty.conf -r root --repository=$PWD/some_repo -yd A @@ -55,7 +55,7 @@ replace_ntimes_body() { atf_check_equal $? 0 xbps-create -A noarch -n D-1.0_1 -s "D pkg" ../pkg_D atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -C empty.conf -r root --repository=$PWD/some_repo -yd A B C D @@ -69,7 +69,7 @@ replace_ntimes_body() { atf_check_equal $? 0 xbps-create -A noarch -n D-1.1_1 -s "D pkg" --replaces "A<1.1" ../pkg_D atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. result=$(xbps-install -C empty.conf -r root --repository=$PWD/some_repo -yun|wc -l) @@ -92,7 +92,7 @@ self_replace_body() { atf_check_equal $? 0 xbps-create -A noarch -n B-1.0_1 -s "B pkg" --replaces "A>=0" --provides="A-1.0_1" ../pkg_B atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -C empty.conf -r root --repository=$PWD/some_repo -yd A @@ -125,7 +125,7 @@ replace_vpkg_body() { atf_check_equal $? 0 xbps-create -A noarch -n qt-32bit-1.0_1 -s "qt 32bit pkg" --dependencies "libGL-32bit>=0" ../qt-32bit atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -C empty.conf -r root --repository=$PWD/some_repo -yd libGL-32bit diff --git a/tests/xbps/libxbps/shell/scripts_test.sh b/tests/xbps/libxbps/shell/scripts_test.sh index 052a484f..9c6763d5 100644 --- a/tests/xbps/libxbps/shell/scripts_test.sh +++ b/tests/xbps/libxbps/shell/scripts_test.sh @@ -32,7 +32,7 @@ script_nargs_body() { cd some_repo xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -C empty.conf -r root --repository=$PWD/some_repo -y A @@ -65,7 +65,7 @@ script_arch_body() { cd some_repo xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -C empty.conf -r root --repository=$PWD/some_repo -y A diff --git a/tests/xbps/libxbps/shell/update_shlibs.sh b/tests/xbps/libxbps/shell/update_shlibs.sh index 5f6816a3..63a50b2e 100644 --- a/tests/xbps/libxbps/shell/update_shlibs.sh +++ b/tests/xbps/libxbps/shell/update_shlibs.sh @@ -18,7 +18,7 @@ shlib_bump_body() { atf_check_equal $? 0 xbps-create -A noarch -n B-1.0_1 -s "B pkg" --dependencies "A>=0" --shlib-requires "libfoo.so.1" ../pkg_B atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -28,7 +28,7 @@ shlib_bump_body() { cd repo xbps-create -A noarch -n A-2.0_1 -s "A pkg" --shlib-provides "libfoo.so.2" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -54,7 +54,7 @@ shlib_bump_revdep_in_trans_body() { atf_check_equal $? 0 xbps-create -A noarch -n B-1.0_1 -s "B pkg" --dependencies "A>=1.0" --shlib-requires "libfoo.so.1" ../pkg_B atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -66,7 +66,7 @@ shlib_bump_revdep_in_trans_body() { atf_check_equal $? 0 xbps-create -A noarch -n B-2.0_1 -s "B pkg" --dependencies "A>=0" --shlib-requires "libfoo.so.2" ../pkg_B atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -98,7 +98,7 @@ shlib_bump_incomplete_revdep_in_trans_body() { atf_check_equal $? 0 xbps-create -A noarch -n B-1.0_1 -s "B pkg" --dependencies "A>=1.0" --shlib-requires "libfoo.so.1" ../pkg_B atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -110,7 +110,7 @@ shlib_bump_incomplete_revdep_in_trans_body() { atf_check_equal $? 0 xbps-create -A noarch -n B-1.1_1 -s "B pkg" --dependencies "A>=0" --shlib-requires "libfoo.so.1" ../pkg_B atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -133,7 +133,7 @@ shlib_bump_revdep_diff_body() { atf_check_equal $? 0 xbps-create -A noarch -n C-1.0_1 -s "C pkg" --dependencies "A>=0 B>=0" --shlib-requires "liba.so.1 libb.so.1" ../pkg atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -147,7 +147,7 @@ shlib_bump_revdep_diff_body() { atf_check_equal $? 0 xbps-create -A noarch -n C-2.0_1 -s "C pkg" --dependencies "A>=2.0" --shlib-requires "liba.so.2" ../pkg atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. diff --git a/tests/xbps/libxbps/shell/vpkg_test.sh b/tests/xbps/libxbps/shell/vpkg_test.sh index 2a7455ff..7af39946 100644 --- a/tests/xbps/libxbps/shell/vpkg_test.sh +++ b/tests/xbps/libxbps/shell/vpkg_test.sh @@ -32,7 +32,7 @@ vpkg00_body() { xbps-create -A noarch -n D-1.0_1 -s "D pkg" --provides "libEGL-2.0_1" ../pkg_D atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -61,7 +61,7 @@ vpkg01_body() { xbps-create -A noarch -n D-1.0_1 -s "D pkg" --dependencies "C>=0" ../pkg_D atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -92,7 +92,7 @@ vpkg02_body() { xbps-create -A noarch -n base-system-1.0_1 -s "base-system pkg" --dependencies "gawk>=0" ../pkg_base-system atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. @@ -109,7 +109,7 @@ vpkg02_body() { xbps-create -A noarch -n base-system-1.1_1 -s "base-system pkg" --dependencies "awk>=0" ../pkg_base-system atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. diff --git a/tests/xbps/xbps-checkvers/checkvers.sh b/tests/xbps/xbps-checkvers/checkvers.sh index cedf4c6a..7e99974a 100755 --- a/tests/xbps/xbps-checkvers/checkvers.sh +++ b/tests/xbps/xbps-checkvers/checkvers.sh @@ -20,7 +20,7 @@ EOF cd some_repo xbps-create -A noarch -n A-1.1_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. out=`xbps-checkvers -R $PWD/some_repo -D $PWD/void-packages` @@ -47,7 +47,7 @@ EOF cd some_repo xbps-create -A noarch -n A-1.1_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. out=`xbps-checkvers -R $PWD/some_repo -D $PWD/void-packages` @@ -73,7 +73,7 @@ EOF cd some_repo xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. out=`xbps-checkvers -R $PWD/some_repo -D $PWD/void-packages` diff --git a/tests/xbps/xbps-install/behaviour_tests.sh b/tests/xbps/xbps-install/behaviour_tests.sh index 1f4c4394..02f39ecf 100644 --- a/tests/xbps/xbps-install/behaviour_tests.sh +++ b/tests/xbps/xbps-install/behaviour_tests.sh @@ -13,11 +13,11 @@ install_existent_body() { cd some_repo xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 xbps-create -A noarch -n B-1.1_1 -s "B pkg" ../pkg_B atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -r root -C empty.conf --repository=$PWD/some_repo -y A diff --git a/tests/xbps/xbps-install/revert_tests.sh b/tests/xbps/xbps-install/revert_tests.sh index a582604c..127c70c4 100644 --- a/tests/xbps/xbps-install/revert_tests.sh +++ b/tests/xbps/xbps-install/revert_tests.sh @@ -14,7 +14,7 @@ revert_package_body() { echo first V1.0 > ../pkg_A/file00 xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -r root -C empty.conf --repository=$PWD/some_repo -y A @@ -25,7 +25,7 @@ revert_package_body() { echo V1.1 > ../pkg_A/file00 xbps-create -A noarch -n A-1.1_1 -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -r root -C empty.conf --repository=$PWD/some_repo -y -u @@ -36,7 +36,7 @@ revert_package_body() { echo second V1.0 > ../pkg_A/file00 xbps-create -A noarch -n A-1.0_1 -r "1.1_1" -s "A pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-install -d -r root -C empty.conf --repository=$PWD/some_repo -y -u diff --git a/tests/xbps/xbps-query/remote_test.sh b/tests/xbps/xbps-query/remote_test.sh index 9afbf2fc..3d8e5c8e 100644 --- a/tests/xbps/xbps-query/remote_test.sh +++ b/tests/xbps/xbps-query/remote_test.sh @@ -14,7 +14,7 @@ remote_files_body() { cd some_repo xbps-create -A noarch -n foo-1.0_1 -s "foo pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 rm -f *.xbps cd .. diff --git a/tests/xbps/xbps-rindex/add_test.sh b/tests/xbps/xbps-rindex/add_test.sh index 05d24459..2b4d48ec 100644 --- a/tests/xbps/xbps-rindex/add_test.sh +++ b/tests/xbps/xbps-rindex/add_test.sh @@ -14,11 +14,11 @@ update_body() { cd some_repo xbps-create -A noarch -n foo-1.0_1 -s "foo pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 xbps-create -A noarch -n foo-1.1_1 -s "foo pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. result="$(xbps-query -r root -C empty.conf --repository=some_repo -s '')" @@ -42,11 +42,11 @@ revert_body() { cd some_repo xbps-create -A noarch -n foo-1.1_1 -s "foo pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 xbps-create -A noarch -n foo-1.0_1 -r "1.1_1" -s "foo pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. result="$(xbps-query -r root -C empty.conf --repository=some_repo -s '')" diff --git a/tests/xbps/xbps-rindex/clean_test.sh b/tests/xbps/xbps-rindex/clean_test.sh index ca8a3b16..4ac96a05 100644 --- a/tests/xbps/xbps-rindex/clean_test.sh +++ b/tests/xbps/xbps-rindex/clean_test.sh @@ -13,7 +13,7 @@ noremove_body() { cd some_repo xbps-create -A noarch -n foo-1.0_1 -s "foo pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-rindex -c some_repo @@ -35,7 +35,7 @@ filesclean_body() { cd some_repo xbps-create -A noarch -n foo-1.0_1 -s "foo pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 rm *.xbps cd .. @@ -59,11 +59,11 @@ filesclean2_body() { cd some_repo xbps-create -A noarch -n foo-1.0_1 -s "foo pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 xbps-create -A noarch -n foo-1.1_1 -s "foo pkg" ../pkg_A atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. xbps-rindex -c some_repo @@ -96,7 +96,7 @@ issue19_body() { cd some_repo xbps-create -A noarch -n foo-1.0_1 -s "foo pkg" . atf_check_equal $? 0 - xbps-rindex -d -a *.xbps + xbps-rindex -d -a $PWD/*.xbps atf_check_equal $? 0 cd .. rm some_repo/*.xbps