Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › d8bbde1
tests: Make host ABI detection a bit more sane
Mark Johnston committed 7 months ago
commit d8bbde1c3762c57d0ecafee3168216f8ae081c99
parent 9bb9034
2 files changed +3 -3
modified tests/frontend/abi.sh
@@ -25,7 +25,7 @@ native_body() {
			version=$(uname -r | cut -d. -f1)

			;;

		FreeBSD)
- 
			version=$(uname -r | cut -d. -f1)
+ 
			version=$(freebsd-version -u | cut -d. -f1)

			thisarch=$(echo "${thisarch}" | sed s/x86_64/amd64/)

			thisabi=$(echo "${thisarch}" | sed s/amd64/x86:64/)

			;;
modified tests/frontend/config.sh
@@ -122,8 +122,8 @@ expansion_body() {
	atf_skip_on Darwin "N/A"

	atf_skip_on Linux "N/A"

	OSNAME=$(uname)
- 
	MAJOR_VERSION=$(uname -r | cut -d . -f 1)
- 
	MINOR_VERSION=$(uname -r | cut -d . -f 2 | cut -d - -f 1)
+ 
	MAJOR_VERSION=$(freebsd-version -u | cut -d . -f 1)
+ 
	MINOR_VERSION=$(freebsd-version -u | cut -d . -f 2 | cut -d - -f 1)

	ARCH=$(uname -p)



	atf_check \