Fix outlier in uname -p on Darwin

Darwin considers amd64 an i386 platform with a x86_64 processor architecture.
freebsd · Nov 22, 2024 · 326a23e · 326a23e
1 parent e012e03
commit 326a23e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/tests/frontend/abi.sh b/tests/frontend/abi.sh
@@ -8,11 +8,11 @@ tests_init \
 	override
 
 native_body() {
+	OS=$(uname -s)
 	thisarch=$(uname -p)
-	if [ "$thisarch" = "unknown" ]; then
+	if [ "$thisarch" = "unknown" -o "${OS}" = "Darwin" ]; then
 		thisarch=$(uname -m)
 	fi
-	OS=$(uname -s)
 	if [ "${OS}" = "Linux" ]; then
 		version=$(readelf -n /bin/uname  | awk '/ABI: / { split($NF, a, "."); print a[1]"."a[2] }')
 	else
@@ -77,6 +77,7 @@ elfparse_body() {
 }
 
 machoparse_body() {
+	# Macho-O parsing now works across platforms
 	_expected="Darwin:24:aarch64\n"
 	atf_check \
 		-o inline:"${_expected}" \