--- a/components/mlocate/Makefile Mon Oct 12 14:00:49 2015 -0700
+++ b/components/mlocate/Makefile Mon Oct 12 16:53:46 2015 -0700
@@ -41,6 +41,8 @@
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
+COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
+
CONFIGURE_OPTIONS.64 += CC="$(CC) -m64"
CONFIGURE_OPTIONS += --localstatedir="/var/cache"
CONFIGURE_OPTIONS += --sysconfdir="/etc"
@@ -57,13 +59,19 @@
'-e "s|^/usr/gnu/bin/make.*$$|XXX_REMOVE_XXX|g" ' \
'-e "/^XXX_REMOVE_XXX$$/d" '
-COMPONENT_TEST_ENV += PATH="$(@D)/src:$(USRBINDIR):$(USRSBINDIR)"
-COMPONENT_TEST_CMD = $(SOURCE_DIR)/tests/testsuite
+# Test 41 needs to be able to open at least 950 fds. Bump up the limit.
+COMPONENT_TEST_ENV_CMD = ulimit -n 1000; env
+
+# Need /usr/gnu/bin before /usr/bin for GNU diff.
+COMPONENT_TEST_ENV += PATH="$(@D)/src:$(GNUBIN):$(USRBINDIR):$(USRSBINDIR)"
+
+COMPONENT_TEST_CMD = $(SOURCE_DIR)/tests/testsuite
COMPONENT_TEST_TARGETS =
-COMPONENT_SYSTEM_TEST_ENV += PATH="$(USRBINDIR):$(USRSBINDIR)"
+COMPONENT_SYSTEM_TEST_ENV_CMD = ulimit -n 1000; env
+COMPONENT_SYSTEM_TEST_ENV += PATH="$(GNUBIN):$(USRBINDIR):$(USRSBINDIR)"
COMPONENT_SYSTEM_TEST_CMD = $(SHELL) $(SOURCE_DIR)/tests/testsuite
-COMPONENT_SYSTEM_TEST_ARGS = AUTOTEST_PATH=$(USRBINDIR):$(USRSBINDIR)
+COMPONENT_SYSTEM_TEST_ARGS = AUTOTEST_PATH=$(GNUBIN):$(USRBINDIR):$(USRSBINDIR)
COMPONENT_SYSTEM_TEST_TARGETS =
ASLR_MODE = $(ASLR_ENABLE)
--- a/components/mlocate/test/results-64.master Mon Oct 12 14:00:49 2015 -0700
+++ b/components/mlocate/test/results-64.master Mon Oct 12 16:53:46 2015 -0700
@@ -31,7 +31,7 @@
28: locate: -r ok
29: locate: -V ok
30: locate: -w ok
- 31: locate: -0 FAILED (locate.at:530)
+ 31: locate: -0 ok
32: locate: --regex ok
33: locate: LOCATE_PATH ok
34: locate: Invalid source database ok
@@ -41,27 +41,13 @@
38: updatedb: Invalid source database ok
39: updatedb: Change detection ok
40: updatedb: Concurrent modification ok
- 41: updatedb: Very deep hierarchy FAILED (updatedb.at:261)
- 42: updatedb: Output creation FAILED (updatedb.at:297)
+ 41: updatedb: Very deep hierarchy ok
+ 42: updatedb: Output creation ok
43: updatedb: Path sorting ok
## ------------- ##
## Test results. ##
## ------------- ##
-ERROR: 40 tests were run,
-3 failed unexpectedly.
+40 tests were successful.
3 tests were skipped.
-## -------------------------- ##
-## testsuite.log was created. ##
-## -------------------------- ##
-
-Please send `./testsuite.log' and all information you think might help:
-
- To: <[email protected]>
- Subject: [mlocate 0.25] testsuite: 31 41 42 failed
-
-You may investigate any problem if you feel able to do so, in which
-case the test suite provides a good starting point. Its output may
-be found below `./testsuite.dir'.
-