--- a/components/libevent/Makefile Thu Dec 01 17:10:54 2016 -0800
+++ b/components/libevent/Makefile Fri Dec 02 10:03:48 2016 -0800
@@ -36,6 +36,8 @@
TPNO= 27840
+TEST_TARGET= install $(TEST_32_and_64)
+SYSTEM_TEST_TARGET= build $(SYSTEM_TEST_32_and_64)
include $(WS_MAKE_RULES)/common.mk
COMPONENT_PRE_CONFIGURE_ACTION = \
@@ -51,17 +53,32 @@
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
CONFIGURE_OPTIONS += --disable-static
+# Get correct libevent-2.0.so.5 from the proto area.
+TEST_LIBPATH.32 = $(PROTOUSRLIBDIR)
+TEST_LIBPATH.64 = $(PROTOUSRLIBDIR64)
+COMPONENT_TEST_ENV += LD_LIBRARY_PATH=$(TEST_LIBPATH.$(BITS))
+
+COMPONENT_TEST_DIR = $(@D)/test
COMPONENT_TEST_TARGETS = verify
+COMPONENT_SYSTEM_TEST_DIR = $(@D)/test
+COMPONENT_SYSTEM_TEST_TARGETS = verify
+
# \x24 represents the character '$'
COMPONENT_TEST_TRANSFORMS += \
- '-e "s/^type: .* OKAY\x24/TYPE-COUNT-LINE OKAY/" '
+ '-e "s/^type: .* OKAY\x24/TYPE-COUNT-LINE OKAY/" ' \
+ '-e "/cp test.sh test-script.sh/d" ' \
+ '-e "/Entering directory/d"' \
+ '-e "/Leaving directory/d"' \
+ '-e "/^make/d"' \
+ '-e "s|^.*$(CC).*$$|XXX_CC_XXX|g" ' \
+ '-e "s|^.*source=.*libtool=no.*$$|XXX_CC_XXX|g" ' \
+ '-e "s|^.*DEPDIR=.deps.*$$|XXX_CC_XXX|g" ' \
+ '-e "/^XXX_CC_XXX$$/d" '
# Master test results are the same for 32-bit and 64-bit, so override
# here, rather than create multiple identical master files.
COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
-COMPONENT_TEST_TRANSFORMS += \
- '-e "/cp test.sh test-script.sh/d" '
REQUIRED_PACKAGES += library/security/openssl
REQUIRED_PACKAGES += library/security/openssl/openssl-fips-140
--- a/components/libevent/test/results-all.master Thu Dec 01 17:10:54 2016 -0800
+++ b/components/libevent/test/results-all.master Fri Dec 02 10:03:48 2016 -0800
@@ -1,23 +1,5 @@
-make[1]: Entering directory '$(@D)'
-/usr/gnu/bin/make check-recursive
-make[2]: Entering directory '$(@D)'
-Making check in .
-make[3]: Entering directory '$(@D)'
-make[3]: Leaving directory '$(@D)'
-Making check in include
-make[3]: Entering directory '$(@D)/include'
-make[3]: Nothing to be done for 'check'.
-make[3]: Leaving directory '$(@D)/include'
-Making check in sample
-make[3]: Entering directory '$(@D)/sample'
-make[3]: Nothing to be done for 'check'.
-make[3]: Leaving directory '$(@D)/sample'
-Making check in test
-make[3]: Entering directory '$(@D)/test'
/usr/gnu/bin/make check-am
-make[4]: Entering directory '$(@D)/test'
/usr/gnu/bin/make check-TESTS
-make[5]: Entering directory '$(@D)/test'
Running tests:
EVPORT
test-eof: OKAY
@@ -73,18 +55,3 @@
==================
1 of 1 test failed
==================
-Makefile:820: recipe for target 'check-TESTS' failed
-make[5]: *** [check-TESTS] Error 1
-make[5]: Leaving directory '$(@D)/test'
-Makefile:943: recipe for target 'check-am' failed
-make[4]: *** [check-am] Error 2
-make[4]: Leaving directory '$(@D)/test'
-Makefile:945: recipe for target 'check' failed
-make[3]: *** [check] Error 2
-make[3]: Leaving directory '$(@D)/test'
-Makefile:864: recipe for target 'check-recursive' failed
-make[2]: *** [check-recursive] Error 1
-make[2]: Leaving directory '$(@D)'
-Makefile:1176: recipe for target 'check' failed
-make[1]: *** [check] Error 2
-make[1]: Leaving directory '$(@D)'