tests: unset XBPS_{,TARGET_}ARCH when testing architecure config option

Duncaen · Duncaen · commit 4053050b84c8 · 2025-06-14T01:14:57.000+02:00
since the environment variables now take precendence over the config
option and xbps-src exports them when running the test suite this needs
to be unset. Might probably make sense to unset all xbps related ones
somehow in the test suite globally.
diff --git a/tests/xbps/xbps-uhelper/arch_test.sh b/tests/xbps/xbps-uhelper/arch_test.sh
@@ -28,6 +28,7 @@ conf_head() {
 }
 conf_body() {
 	mkdir -p xbps.d
+	unset XBPS_ARCH XBPS_TARGET_ARCH
 	echo "architecture=x86_64-musl" > xbps.d/arch.conf
 	atf_check_equal $(xbps-uhelper -C $PWD/xbps.d arch) x86_64-musl
 }

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ conf_head() {`
`28`	`28`	`}`
`29`	`29`	`conf_body() {`
`30`	`30`	`mkdir -p xbps.d`
	`31`	`+ unset XBPS_ARCH XBPS_TARGET_ARCH`
`31`	`32`	`echo "architecture=x86_64-musl" > xbps.d/arch.conf`
`32`	`33`	`atf_check_equal $(xbps-uhelper -C $PWD/xbps.d arch) x86_64-musl`
`33`	`34`	`}`