--- a/components/python/pyasn1/Makefile Mon Feb 22 16:08:11 2016 -0800
+++ b/components/python/pyasn1/Makefile Tue Feb 23 15:19:53 2016 -0800
@@ -18,28 +18,34 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= pyasn1
-COMPONENT_VERSION= 0.1.7
+COMPONENT_VERSION= 0.1.9
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:e4f81d53c533f6bd9526b047f047f7b101c24ab17339c1a7ad8f98b25c101eab
+ sha256:853cacd96d1f701ddd67aa03ecc05f51890135b7262e922710112f12a2ed2a7f
COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_PROJECT_URL= http://pyasn1.sourceforge.net/
COMPONENT_BUGDB= python-mod/pyasn1
-TPNO= 14413
+TPNO= 26348
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
include $(WS_MAKE_RULES)/ips.mk
-COMPONENT_TEST_DIR = $(SOURCE_DIR)/test
-COMPONENT_TEST_ARGS = suite.py
+COMPONENT_TEST_DIR = $(SOURCE_DIR)
+COMPONENT_TEST_ARGS = setup.py test
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
+
+# The test output contains arbitrary output. Use nawk to extract just the
+# sections that summarizes the test result.
+COMPONENT_TEST_TRANSFORMER = $(NAWK)
+COMPONENT_TEST_TRANSFORMS = "'/^Ran .+ / { sub(\" tests in .+s\", \" tests in\"); print }; /!NF/ { print }; /^OK/ { print };'"
ASLR_MODE = $(ASLR_NOT_APPLICABLE)