--- a/make-rules/shared-macros.mk	Fri May 01 10:30:59 2015 -0700
+++ b/make-rules/shared-macros.mk	Mon May 04 10:54:49 2015 -0700
@@ -229,6 +229,9 @@
 # set the default target for installation of the component
 COMPONENT_INSTALL_TARGETS =	install
 
+# set the default env command to use for test of the component
+COMPONENT_TEST_ENV_CMD =	$(ENV)
+
 TEST_32 =		$(BUILD_DIR_32)/.tested
 TEST_64 =		$(BUILD_DIR_64)/.tested
 TEST_32_and_64 =	$(TEST_32) $(TEST_64)
@@ -428,6 +431,7 @@
 CAT =		/bin/cat
 SYMLINK =	/bin/ln -s
 ENV =		/usr/bin/env
+GNU_ENV =	/usr/gnu/bin/env
 INSTALL =	/usr/bin/ginstall
 GNU_GREP =	/usr/gnu/bin/grep
 CHMOD =		/usr/bin/chmod