Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Fix pkg.sh test script
Baptiste Daroussin committed 11 years ago
commit 3ee03b2ea3aee364b9aa5ea31d38e313cf550096
parent 2a998ec
1 file changed +23 -27
modified tests/frontend/pkg.sh
@@ -39,33 +39,29 @@ pkg_config_defaults_head()
pkg_config_defaults_body()
{
    atf_check                 \
-
	-o match:'^ *PKG_DBDIR: /var/db/pkg$' \
-
	-o match:'^ *PKG_CACHEDIR: /var/cache/pkg$' \
-
	-o match:'^ *PORTSDIR: /usr/ports$' \
-
	-o match:'^ *HANDLE_RC_SCRIPTS: no$' \
-
	-o match:'^ *ASSUME_ALWAYS_YES: no$' \
-
	-o match:'^ *PLIST_KEYWORDS_DIR: $' \
-
	-o match:'^ *SYSLOG: yes$' \
-
	-o match:'^ *ABI: [a-zA-Z0-9]+:[a-zA-Z0-9]+:[a-zA-Z0-9]+:[a-zA-Z0-9]+$' \
-
	-o match:'^ *DEVELOPER_MODE: no$' \
-
	-o match:'^ *PORTAUDIT_SITE: http://portaudit.FreeBSD.org/auditfile.tbz$' \
-
	-o match:'^ *VULNXML_SITE: http://www.vuxml.org/freebsd/vuln.xml.bz2$' \
-
	-o match:'^ *FETCH_RETRY: 3$' \
-
	-o match:'^ *PKG_PLUGINS_DIR: /usr/local/lib/pkg/$' \
-
	-o match:'^ *PKG_ENABLE_PLUGINS: yes$' \
-
	-o match:'^ *PLUGINS:$' \
-
	-o match:'^ *DEBUG_SCRIPTS: no$' \
-
	-o match:'^ *PLUGINS_CONF_DIR: /usr/local/etc/pkg/$' \
-
	-o match:'^ *PERMISSIVE: no$' \
-
	-o match:'^ *REPO_AUTOUPDATE: yes$' \
-
	-o match:'^ *NAMESERVER: $' \
-
	-o match:'^ *EVENT_PIPE: $' \
-
	-o match:'^ *FETCH_TIMEOUT: 30$' \
-
	-o match:'^ *UNSET_TIMESTAMP: no$' \
-
	-o match:'^ *SSH_RESTRICT_DIR: $' \
-
	-o match:'^ *REPOS_DIR: /usr/local/etc/pkg/repos/$' \
-
	-o match:'^ *PKG_ENV:$' \
-
	-o match:'^ *DISABLE_MTREE: no$' \
+
	-o match:'^ *PKG_DBDIR = "/var/db/pkg";$' \
+
	-o match:'^ *PKG_CACHEDIR = "/var/cache/pkg";$' \
+
	-o match:'^ *PORTSDIR = "/usr/ports";$' \
+
	-o match:'^ *HANDLE_RC_SCRIPTS = false;$' \
+
	-o match:'^ *ASSUME_ALWAYS_YES = false;$' \
+
	-o match:'^ *PLIST_KEYWORDS_DIR = "";$' \
+
	-o match:'^ *SYSLOG = true;$' \
+
	-o match:'^ *ABI = "[a-zA-Z0-9]+:[a-zA-Z0-9]+:[a-zA-Z0-9]+:[a-zA-Z0-9]+";$' \
+
	-o match:'^ *DEVELOPER_MODE = false;$' \
+
	-o match:'^ *VULNXML_SITE = "http://www.vuxml.org/freebsd/vuln.xml.bz2";$' \
+
	-o match:'^ *FETCH_RETRY = 3;$' \
+
	-o match:'^ *PKG_PLUGINS_DIR = "/usr/local/lib/pkg/";$' \
+
	-o match:'^ *PKG_ENABLE_PLUGINS = true;$' \
+
	-o match:'^ *DEBUG_SCRIPTS = false;$' \
+
	-o match:'^ *PLUGINS_CONF_DIR = "/usr/local/etc/pkg/";$' \
+
	-o match:'^ *PERMISSIVE = false;$' \
+
	-o match:'^ *REPO_AUTOUPDATE = true;$' \
+
	-o match:'^ *NAMESERVER = "";$' \
+
	-o match:'^ *EVENT_PIPE = "";$' \
+
	-o match:'^ *FETCH_TIMEOUT = 30;$' \
+
	-o match:'^ *UNSET_TIMESTAMP = false;$' \
+
	-o match:'^ *SSH_RESTRICT_DIR = "";$' \
+
	-o match:'^ *DISABLE_MTREE = false;$' \
	-e empty              \
	-s exit:0             \
	env -i PATH=${PATH} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} pkg -C "" -R "" -vv