diff --git a/tests/xbps/libxbps/shell/conf_files_test.sh b/tests/xbps/libxbps/shell/conf_files_test.sh index 4e6b3396..be023550 100644 --- a/tests/xbps/libxbps/shell/conf_files_test.sh +++ b/tests/xbps/libxbps/shell/conf_files_test.sh @@ -18,7 +18,7 @@ tc1_body() { rm -rf pkg_a xbps-rindex -a *.xbps atf_check_equal $? 0 - xbps-install -r rootdir --repository=$PWD -y a + xbps-install -C null.conf -r rootdir --repository=$PWD -y a atf_check_equal $? 0 sed -e 's,fooblah,blahfoo,' -i rootdir/cf1.conf @@ -29,7 +29,7 @@ tc1_body() { xbps-rindex -a *.xbps rm -rf pkg_a atf_check_equal $? 0 - xbps-install -r rootdir --repository=$PWD -yu + xbps-install -C null.conf -r rootdir --repository=$PWD -yu atf_check_equal $? 0 result="$(cat rootdir/cf1.conf)" rval=1 @@ -58,7 +58,7 @@ tc2_body() { rm -rf pkg_a xbps-rindex -a *.xbps atf_check_equal $? 0 - xbps-install -r rootdir --repository=$PWD -y a + xbps-install -C null.conf -r rootdir --repository=$PWD -y a atf_check_equal $? 0 sed -e 's,fooblah,blahfoo,' -i rootdir/cf1.conf @@ -71,7 +71,7 @@ tc2_body() { xbps-rindex -a *.xbps rm -rf pkg_a atf_check_equal $? 0 - xbps-install -r rootdir --repository=$PWD -yu + xbps-install -C null.conf -r rootdir --repository=$PWD -yu atf_check_equal $? 0 result="$(cat rootdir/cf1.conf)" rval=1 @@ -105,7 +105,7 @@ tc3_body() { rm -rf pkg_a xbps-rindex -a *.xbps atf_check_equal $? 0 - xbps-install -r rootdir --repository=$PWD -y a + xbps-install -C null.conf -r rootdir --repository=$PWD -y a atf_check_equal $? 0 sed -e 's,fooblah,blahfoo,' -i rootdir/cf1.conf @@ -118,7 +118,7 @@ tc3_body() { xbps-rindex -a *.xbps rm -rf pkg_a atf_check_equal $? 0 - xbps-install -r rootdir --repository=$PWD -yu + xbps-install -C null.conf -r rootdir --repository=$PWD -yu atf_check_equal $? 0 result="$(cat rootdir/cf1.conf)" rval=1 diff --git a/tests/xbps/libxbps/shell/issue18_test.sh b/tests/xbps/libxbps/shell/issue18_test.sh index b5cb526d..cd8c6b3d 100644 --- a/tests/xbps/libxbps/shell/issue18_test.sh +++ b/tests/xbps/libxbps/shell/issue18_test.sh @@ -22,7 +22,7 @@ issue18_body() { atf_check_equal $? 0 xbps-rindex -a *.xbps atf_check_equal $? 0 - xbps-install -r rootdir --repository=$PWD -y A B + xbps-install -C null.conf -r rootdir --repository=$PWD -y A B atf_check_equal $? 0 xbps-create -A noarch -n A-0.2_1 -s "pkg A" --conflicts "B<0.1_2" pkg_A @@ -31,7 +31,7 @@ issue18_body() { atf_check_equal $? 0 xbps-rindex -a *.xbps atf_check_equal $? 0 - xbps-install -r rootdir --repository=$PWD -yu + 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 7cd7b4e4..987eae4e 100644 --- a/tests/xbps/libxbps/shell/issue20_test.sh +++ b/tests/xbps/libxbps/shell/issue20_test.sh @@ -31,7 +31,7 @@ issue20_body() { rm -rf pkg_a xbps-rindex -a *.xbps atf_check_equal $? 0 - xbps-install -r rootdir --repository=$PWD -y a + xbps-install -C null.conf -r rootdir --repository=$PWD -y a atf_check_equal $? 0 mkdir pkg_a @@ -42,7 +42,7 @@ issue20_body() { rm -rf pkg_a xbps-rindex -a *.xbps atf_check_equal $? 0 - xbps-install -r rootdir --repository=$PWD -yu + xbps-install -C null.conf -r rootdir --repository=$PWD -yu atf_check_equal $? 0 tgt=$(readlink rootdir/foo) rval=1 diff --git a/tests/xbps/libxbps/shell/issue6_test.sh b/tests/xbps/libxbps/shell/issue6_test.sh index 6cb5a0db..7a32c0ee 100644 --- a/tests/xbps/libxbps/shell/issue6_test.sh +++ b/tests/xbps/libxbps/shell/issue6_test.sh @@ -24,7 +24,7 @@ issue6_body() { atf_check_equal $? 0 xbps-rindex -a *.xbps atf_check_equal $? 0 - xbps-install -r rootdir --repository=$PWD -y a + xbps-install -C null.conf -r rootdir --repository=$PWD -y a atf_check_equal $? 0 mkdir -p rootdir/usr/lib/firefox/dictionaries mkdir -p rootdir/usr/lib/firefox/hyphenation @@ -36,7 +36,7 @@ issue6_body() { rm -rf pkg_a xbps-rindex -a *.xbps atf_check_equal $? 0 - xbps-install -r rootdir --repository=$PWD -yu + xbps-install -C null.conf -r rootdir --repository=$PWD -yu atf_check_equal $? 0 tgt1=$(readlink rootdir/usr/lib/firefox/dictionaries) tgt2=$(readlink rootdir/usr/lib/firefox/hyphenation)