components/popt/patches/popt-02-testit.sh.patch
author Rich Burridge <rich.burridge@oracle.com>
Wed, 20 Jul 2016 10:13:37 -0700
changeset 6439 b66f3093f546
parent 5588 33ed1c330eea
permissions -rw-r--r--
24289304 nosetests manpages delivered in /usr/share/man, not /usr/share/man/man1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5588
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
     1
Running "gmake test" was failing for tests 58 and 59 because the wrong
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
     2
test name was specified.
1086
658961e6c9b9 15820214 SUNBT7202654 Move popt from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     3
5588
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
     4
This patch should be sent upstream.
1086
658961e6c9b9 15820214 SUNBT7202654 Move popt from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     5
5588
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
     6
--- popt-1.16/testit.sh.orig	2016-03-08 07:21:32.625991783 -0800
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
     7
+++ popt-1.16/testit.sh	2016-03-08 07:22:06.498564459 -0800
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
     8
@@ -115,7 +115,7 @@
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
     9
 run test1 "test1 - 57" "arg1: 0 arg2: (none) aBits: foo,baz" --bits foo,bar,baz,!bar
1086
658961e6c9b9 15820214 SUNBT7202654 Move popt from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    10
 
5588
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
    11
 run test1 "test1 - 58" "\
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
    12
-Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
    13
+Usage: test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
    14
         [-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val]
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
    15
         [-i|--int=INT] [-s|--short=SHORT] [-l|--long=LONG]
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
    16
         [-L|--longlong=LONGLONG] [-f|--float=FLOAT] [-d|--double=DOUBLE]
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
    17
@@ -124,7 +124,7 @@
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
    18
         [--bitxor] [--nstr=STRING] [--lstr=STRING] [-I|--inc]
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
    19
         [-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
    20
 run test1 "test1 - 59" "\
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
    21
-Usage: lt-test1 [OPTION...]
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
    22
+Usage: test1 [OPTION...]
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
    23
       --arg1                      First argument with a really long
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
    24
                                   description. After all, we have to test
33ed1c330eea 22886426 Update popt to version 1.16
Rich Burridge <rich.burridge@oracle.com>
parents: 1086
diff changeset
    25
                                   argument help wrapping somehow, right?