--- 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)'