Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
20555230 GNU getopt should be updated to version 1.1.6
authorRich Burridge <rich.burridge@oracle.com>
Mon, 02 Mar 2015 14:06:57 -0800
changeset 3884 900fc6843a9d
parent 3883 1b46079cc49a
child 3885 446b930bb478
20555230 GNU getopt should be updated to version 1.1.6
components/getopt/Makefile file | annotate | diff | comparison | revisions
components/getopt/getopt.p5m file | annotate | diff | comparison | revisions
components/getopt/test/results-64.master file | annotate | diff | comparison | revisions 
--- a/components/getopt/Makefile	Mon Mar 02 14:04:33 2015 -0800
+++ b/components/getopt/Makefile	Mon Mar 02 14:06:57 2015 -0800
@@ -26,16 +26,16 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		getopt
-COMPONENT_VERSION=	1.1.5
-COMPONENT_PROJECT_URL=	http://software.frodo.looijaard.name/getopt/
+COMPONENT_VERSION=	1.1.6
+COMPONENT_PROJECT_URL=	http://frodo.looijaard.name/project/getopt/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:11893276b94b1629606ab75772143918a5713259950fbf4216288e246f19fbb6
-COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)files/$(COMPONENT_ARCHIVE)
+    sha256:d0bf1dc642a993e7388a1cddfb9409bed375c21d5278056ccca3a0acd09dc5fe
+COMPONENT_ARCHIVE_URL=	http://frodo.looijaard.name/system/files/software/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/gnu-getopt
 
-TPNO=			11356
+TPNO=			21550
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/justmake.mk
@@ -56,18 +56,11 @@
 COMPONENT_POST_UNPACK_ACTION= \
 	$(RM) $(COMPONENT_SRC)/gnu/*.o
 
-# The getopt source directory contains bash and tcsh getopt example scripts.
-TEST_ARGS = -a par1 'another arg' --c-long 'wow\!*\?' -cmore -b " very long "
 COMPONENT_TEST_ENV +=		PATH=$(BUILD_DIR_$(BITS)):$(PATH)
-COMPONENT_TEST_DIR =		$(SOURCE_DIR)
-COMPONENT_TEST_CMD =		getopt-parse.bash $(TEST_ARGS); \
-				$(ENV) $(COMPONENT_TEST_ENV) \
-				getopt-parse.tcsh $(TEST_ARGS)
-COMPONENT_TEST_TARGETS =
+COMPONENT_TEST_TARGETS =	test
 
 ASLR_MODE = $(ASLR_ENABLE)
 
-# common targets
 build:		$(BUILD_64)
 
 install:	$(INSTALL_64)
--- a/components/getopt/getopt.p5m	Mon Mar 02 14:04:33 2015 -0800
+++ b/components/getopt/getopt.p5m	Mon Mar 02 14:06:57 2015 -0800
@@ -43,6 +43,7 @@
 file path=usr/gnu/share/locale/fi/LC_MESSAGES/getopt.mo
 file path=usr/gnu/share/locale/fr/LC_MESSAGES/getopt.mo
 file path=usr/gnu/share/locale/gl/LC_MESSAGES/getopt.mo
+file path=usr/gnu/share/locale/hr/LC_MESSAGES/getopt.mo
 file path=usr/gnu/share/locale/hu/LC_MESSAGES/getopt.mo
 file path=usr/gnu/share/locale/id/LC_MESSAGES/getopt.mo
 file path=usr/gnu/share/locale/it/LC_MESSAGES/getopt.mo
--- a/components/getopt/test/results-64.master	Mon Mar 02 14:04:33 2015 -0800
+++ b/components/getopt/test/results-64.master	Mon Mar 02 14:06:57 2015 -0800
@@ -1,16 +1,189 @@
-Option a
-Option c, no argument
-Option c, argument `more'
-Option b, argument ` very long '
-Remaining arguments:
---> `par1'
---> `another arg'
---> `wow\!*\?'
-Option a
-Option c, no argument
-Option c, argument `more'
-Option b, argument ` very long '
-Remaining arguments:
---> `par1'
---> `another arg'
---> `wow\!*\?'
+make[1]: Entering directory `$(@D)'
+./run-tests
+Next test: alternative_option_clash
+Received expected exit code
+Received expected stdout output
+Received expected stderr output
+
+
+Next test: alternative_option_long
+Received expected exit code
+Received expected stdout output
+Received expected stderr output
+
+
+Next test: alternative_option_short
+Received expected exit code
+Received expected stdout output
+Received expected stderr output
+
+
+Next test: invalid_getopt_option
+Received expected exit code
+Received expected stdout output
+TEST FAILED: unexpected stdout output, diff follows:
+1c1
+< ./getopt: invalid option -- b
+---
+> ./getopt: invalid option -- 'b'
+
+
+Next test: invocation_model_one
+Received expected exit code
+Received expected stdout output
+Received expected stderr output
+
+
+Next test: invocation_model_three_as_one
+Received expected exit code
+Received expected stdout output
+Received expected stderr output
+
+
+Next test: invocation_model_two_as_one
+Received expected exit code
+Received expected stdout output
+Received expected stderr output
+
+
+Next test: invocation_without_parameters
+Received expected exit code
+Received expected stdout output
+Received expected stderr output
+
+
+Next test: long_option_ambiguous_1
+Received expected exit code
+Received expected stdout output
+TEST FAILED: unexpected stdout output, diff follows:
+1c1
+< ./getopt: option `--long' is ambiguous
+---
+> ./getopt: option '--long' is ambiguous
+
+
+Next test: longopts
+Received expected exit code
+Received expected stdout output
+Received expected stderr output
+
+
+Next test: name_option_long
+Received expected exit code
+Received expected stdout output
+TEST FAILED: unexpected stdout output, diff follows:
+1,2c1,2
+< THIS_PROGRAM: invalid option -- b
+< THIS_PROGRAM: unrecognized option `--whatever'
+---
+> THIS_PROGRAM: invalid option -- 'b'
+> THIS_PROGRAM: unrecognized option '--whatever'
+
+
+Next test: name_option_short
+Received expected exit code
+Received expected stdout output
+TEST FAILED: unexpected stdout output, diff follows:
+1,2c1,2
+< THIS_PROGRAM: invalid option -- b
+< THIS_PROGRAM: unrecognized option `--whatever'
+---
+> THIS_PROGRAM: invalid option -- 'b'
+> THIS_PROGRAM: unrecognized option '--whatever'
+
+
+Next test: quiet_option_long
+Received expected exit code
+Received expected stdout output
+Received expected stderr output
+
+
+Next test: quiet_option_short
+Received expected exit code
+Received expected stdout output
+Received expected stderr output
+
+
+Next test: quiet_output_option_long
+Received expected exit code
+Received expected stdout output
+TEST FAILED: unexpected stdout output, diff follows:
+1,4c1,4
+< ./getopt: invalid option -- c
+< ./getopt: unrecognized option `--unknown'
+< ./getopt: option `--long' is ambiguous
+< ./getopt: option requires an argument -- b
+---
+> ./getopt: invalid option -- 'c'
+> ./getopt: unrecognized option '--unknown'
+> ./getopt: option '--long' is ambiguous
+> ./getopt: option requires an argument -- 'b'
+
+
+Next test: quiet_output_option_short
+Received expected exit code
+Received expected stdout output
+TEST FAILED: unexpected stdout output, diff follows:
+1,4c1,4
+< ./getopt: invalid option -- c
+< ./getopt: unrecognized option `--unknown'
+< ./getopt: option `--long' is ambiguous
+< ./getopt: option requires an argument -- b
+---
+> ./getopt: invalid option -- 'c'
+> ./getopt: unrecognized option '--unknown'
+> ./getopt: option '--long' is ambiguous
+> ./getopt: option requires an argument -- 'b'
+
+
+Next test: same_long_short_options
+Received expected exit code
+Received expected stdout output
+Received expected stderr output
+
+
+Next test: test_for_enhanced_getopt
+Received expected exit code
+Received expected stdout output
+Received expected stderr output
+
+
+Next test: unknown_options
+Received expected exit code
+Received expected stdout output
+TEST FAILED: unexpected stdout output, diff follows:
+1,2c1,2
+< ./getopt: invalid option -- b
+< ./getopt: unrecognized option `--whatever'
+---
+> ./getopt: invalid option -- 'b'
+> ./getopt: unrecognized option '--whatever'
+
+
+Next test: unquoted_option_bash
+Received expected exit code
+Received expected stdout output
+Received expected stderr output
+
+
+Next test: unquoted_option_tcsh
+Received expected exit code
+Received expected stdout output
+Received expected stderr output
+
+
+Next test: weird_quoting_bash
+Received expected exit code
+Received expected stdout output
+Received expected stderr output
+
+
+Next test: weird_quoting_tcsh
+Received expected exit code
+Received expected stdout output
+Received expected stderr output
+
+
+SOME TESTS FAILED:  invalid_getopt_option long_option_ambiguous_1 name_option_long name_option_short quiet_output_option_long quiet_output_option_short unknown_options
+make[1]: *** [test] Error 1
+make[1]: Leaving directory `$(@D)'
upstream/oracle/userland-gate