--- a/components/mercurial/Makefile Wed Apr 01 05:46:00 2015 -0700
+++ b/components/mercurial/Makefile Fri Feb 06 14:10:05 2015 -0800
@@ -18,22 +18,27 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+
#
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
include ../../make-rules/shared-macros.mk
PATH=/usr/bin:/usr/gnu/bin:/usr/sbin
COMPONENT_NAME= mercurial
-COMPONENT_VERSION= 2.8.2
+COMPONENT_VERSION= 3.2.3
COMPONENT_PROJECT_URL= http://mercurial.selenic.com/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:c8a5baa21140c6cd6749c3b52b5e5e4a14b6b8ee7c518d9d9de09b1952efbe6f
+ sha256:c4369320e276d78aada1b5936e96c7bbbbb8154cfba725ef4e8757dcedeaf1ef
COMPONENT_ARCHIVE_URL= http://www.selenic.com/mercurial/release/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/hg
+TPNO= 21341
+
include $(WS_TOP)/make-rules/prep.mk
include $(WS_TOP)/make-rules/setup.py.mk
include $(WS_TOP)/make-rules/ips.mk
@@ -44,9 +49,23 @@
PKG_PROTO_DIRS += $(COMPONENT_SRC)/contrib
PKG_PROTO_DIRS += $(COMPONENT_SRC)/doc
-# Set mod time of patched file from patch. Use this to ensure that the .py
-# file consistently gets the same timestamp.
-$(SOURCE_DIR)/.https_proxy.patched: GPATCH_FLAGS += -Z
+# Use bash in sh mode for the tests; using /bin/sh on Solaris hasn't always
+# worked, and using /bin/bash doesn't always work, either. Also skip the
+# tests which try to check all the code in the userland gate. And finally,
+# test the bits from the proto area, rather than rebuilding. Given the way the
+# test suite works, the hg executable must be named "hg".
+COMPONENT_PRE_TEST_ACTION = \
+ (cd $(BUILD_DIR); rm -f sh; ln -s /bin/bash sh; \
+ echo "test-check-code-hg.t\ntest-module-imports.t" > blacklist); \
+ (cd $(PROTOUSRBINDIR); rm -f hg; ln -s hg-$(PYTHON_VERSION) hg)
+
+COMPONENT_TEST_DIR = $(COMPONENT_SRC)/tests
+COMPONENT_TEST_ENV_CMD = $(ENV)
+COMPONENT_TEST_ENV = PYTHONPATH=$(PROTO_DIR)/$(PYTHON_LIB) TERM=dumb
+COMPONENT_TEST_ARGS = ./run-tests.py \
+ --shell $(BUILD_DIR)/sh \
+ --with-hg $(PROTOUSRBINDIR)/hg \
+ --blacklist $(BUILD_DIR)/blacklist
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
@@ -77,20 +96,7 @@
install: $(INSTALL_32)
-# Use bash in sh mode for the tests; using /bin/sh on Solaris hasn't always
-# worked, and using /bin/bash doesn't always work, either. Also skip the
-# check-code test, since that ends up trying to check all the code in the
-# userland gate. And finally, test the bits from the proto area, rather than
-# rebuilding. Given the way the test suite works, the hg executable must be
-# named "hg".
-test: $(INSTALL_32)
- (cd $(BUILD_DIR); rm -f sh; ln -s /bin/bash sh; \
- echo test-check-code-hg.t > blacklist)
- (cd $(PROTOUSRBINDIR); ln -s hg-$(PYTHON_VERSION) hg)
- (cd $(COMPONENT_SRC)/tests ; \
- PYTHONPATH=$(PROTO_DIR)/$(PYTHON_LIB) TERM=dumb \
- $(PYTHON) ./run-tests.py --shell $(BUILD_DIR)/sh \
- --with-hg $(PROTOUSRBINDIR)/hg --blacklist $(BUILD_DIR)/blacklist)
+test: install $(TEST_32)
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)