Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › b2566ad
tests: fix altabi matching on linux
Baptiste Daroussin committed 1 year ago
commit b2566adec1b1f0283244a733c2160c1a4adebdda
parent f8892aa
3 files changed +19 -10
deleted UndefinedBehaviour.suppress
@@ -1,9 +0,0 @@
- 
#
- 
# These are errors that need to be taken care of, but in the sprit of
- 
# "Put Your Own Oxygen Mask on First", we provide here a suppression list for
- 
# _external_ sources.
- 
#
-
- 
# external/picosat/picosat.c:3432:33: runtime error: applying non-zero offset 8 to null pointer
- 
# +SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior external/picosat/picosat.c:3432:33
- 
pointer-overflow:picosat.c
 

\ No newline at end of file
added UndefinedBehaviour.suppress.in
@@ -0,0 +1,9 @@
+ 
#
+ 
# These are errors that need to be taken care of, but in the sprit of
+ 
# "Put Your Own Oxygen Mask on First", we provide here a suppression list for
+ 
# _external_ sources.
+ 
#
+
+ 
# external/picosat/picosat.c:3432:33: runtime error: applying non-zero offset 8 to null pointer
+ 
# +SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior external/picosat/picosat.c:3432:33
+ 
pointer-overflow:picosat.c
 

\ No newline at end of file
modified tests/frontend/pkg.sh
@@ -21,6 +21,15 @@ pkg_no_database_body() {


pkg_config_defaults_body()

{
+ 
	case "${OS}" in
+ 
	FreeBSD|DragonFly)
+ 
		MATCH_ALTABI='^ *ALTABI = "[a-zA-Z0-9]+:[a-z\.A-Z0-9]+:[a-zA-Z0-9]+:[a-zA-Z0-9:]+";$'
+ 
		;;
+ 
	*)
+ 
		MATCH_ALTABI='^ *ALTABI = "[a-zA-Z0-9]+:[a-z\.A-Z0-9]+:[a-zA-Z0-9_]+;$'
+ 
		;;
+ 
	esac
+ 


	atf_check \

	    -o match:'^ *PKG_DBDIR = "/var/db/pkg";$' \

	    -o match:'^ *PKG_CACHEDIR = "/var/cache/pkg";$' \
@@ -30,7 +39,7 @@ pkg_config_defaults_body()
	    -o match:'^ *ASSUME_ALWAYS_YES = false;$' \

	    -o match:'^ *PLIST_KEYWORDS_DIR = "";$' \

	    -o match:'^ *SYSLOG = true;$' \
- 
	    -o match:'^ *ALTABI = "[a-zA-Z0-9]+:[a-z\.A-Z0-9]+:[a-zA-Z0-9]+:[a-zA-Z0-9:]+";$' \
+ 
	    -o match:"${MATCH_ABI}" \

	    -o match:'^ *DEVELOPER_MODE = false;$' \

	    -o match:'^ *VULNXML_SITE = "https://vuxml.freebsd.org/freebsd/vuln.xml.xz";$' \

	    -o match:'^ *FETCH_RETRY = 3;$' \