tests: fix more tests using wrong architectures from /usr/share/xbps.d or env

Author: Duncaen

tests/xbps/libxbps/shell/scripts_test.sh

@@ -29,25 +29,20 @@ script_nargs_body() {
 	echo "A-1.0_1" > pkg_A/usr/bin/foo
 	create_script pkg_A/INSTALL
 
+	unset XBPS_ARCH XBPS_TARGET_ARCH
+
+	arch=$(xbps-uhelper -r root arch)
 	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 $PWD/*.xbps
-	atf_check_equal $? 0
+	atf_check -o ignore -- xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A
+	# XXX: xbps-rindex has no root flag to ignore /usr/share/xbps.d/xbps-arch.conf
+	XBPS_ARCH="$arch" atf_check -o ignore -- xbps-rindex -a $PWD/*.xbps
 	cd ..
-	xbps-install -C empty.conf -r root --repository=$PWD/some_repo -y A
-	atf_check_equal $? 0
+	atf_check -o ignore \
+		-e inline:"pre A 1.0_1 no no ${arch}\npost A 1.0_1 no no ${arch}\n" -- \
+		xbps-install -C empty.conf -r root --repository=$PWD/some_repo -y A
 
-	rval=0
-	xbps-reconfigure -C empty.conf -r root -f A 2>out
-	out="$(cat out)"
-	expected="post A 1.0_1 no no $(uname -m)"
-	if [ "$out" != "$expected" ]; then
-		echo "out: '$out'"
-		echo "expected: '$expected'"
-		rval=1
-	fi
-	atf_check_equal $rval 0
+	atf_check -o ignore -e inline:"post A 1.0_1 no no ${arch}\n" -- \
+		xbps-reconfigure -C empty.conf -r root -f A
 }
 
 atf_test_case script_arch

tests/xbps/xbps-uhelper/arch_test.sh

@@ -8,7 +8,8 @@ native_head() {
 }
 
 native_body() {
-	atf_check_equal $(xbps-uhelper -r $PWD arch) $(uname -m)
+	unset XBPS_ARCH XBPS_TARGET_ARCH
+	atf_check -o "inline:$(uname -m)\n" -- xbps-uhelper -r "$PWD" arch
 }
 
 atf_test_case env