054967a Only check once for the os name in the global env — HardenedBSD-pkg

HardenedBSD Package Manager

Only check once for the os name in the global env

Baptiste Daroussin committed 10 years ago

commit 054967af3d663d4443fdd54cb2ebf63efcd78770
parent aa6b01fb3b322210bc1e19d44faa2bc65bb34c81

2 files changed +2 -1

modified tests/frontend/001sanity.sh

@@ -1,7 +1,7 @@

 #!/usr/bin/env atf-sh
 . $(atf_get_srcdir)/test_environment.sh
 if [ `uname -s` != "Darwin" ]; then
 if [ "${OS}" != "Darwin" ]; then
 	ldd=ldd
 fi
 tests_init \

modified tests/frontend/test_environment.sh.in

@@ -3,6 +3,7 @@ export PATH=$(atf_get_srcdir)/../../src/.libs:$(atf_get_srcdir)/../../src:${PATH

 export LD_LIBRARY_PATH=$(atf_get_srcdir)/../../libpkg/.libs/
 export INSTALL_AS_USER=yes
 export PKG_DBDIR=.
 export OS=`uname -s`
 export NO_TICK=yes
 jailed=$(sysctl -n security.jail.jailed 2>/dev/null || :)
 if [ "$jailed" = "1" ]; then