RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  [email protected]
  Module: popt                             Date:   18-Jun-2010 20:36:19
  Branch: HEAD                             Handle: 2010061818361900

  Modified files:
    popt                    CHANGES testit.sh

  Log:
    - tests: test-cases for UNWANTEDARGS (Wayne
    Davison<[email protected]>).

  Summary:
    Revision    Changes     Path
    1.136       +1  -0      popt/CHANGES
    1.33        +6  -3      popt/testit.sh
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: popt/CHANGES
  ============================================================================
  $ cvs diff -u -r1.135 -r1.136 CHANGES
  --- popt/CHANGES      18 Jun 2010 02:03:28 -0000      1.135
  +++ popt/CHANGES      18 Jun 2010 18:36:19 -0000      1.136
  @@ -1,4 +1,5 @@
   1.17 -> 2.0:
  +    - jbj: tests: test-cases for UNWANTEDARGS (Wayne 
Davison<[email protected]>).
       - jbj: wire-up almost all *alloc's with assertions.
       - jbj: rename (to shorten) internal con->av[con->ac:con->nav] variables.
       - jbj: fix: rescusitate --enable-build-gcov AutoFu.
  @@ .
  patch -p0 <<'@@ .'
  Index: popt/testit.sh
  ============================================================================
  $ cvs diff -u -r1.32 -r1.33 testit.sh
  --- popt/testit.sh    13 Jun 2010 19:14:53 -0000      1.32
  +++ popt/testit.sh    18 Jun 2010 18:36:19 -0000      1.33
  @@ -7,7 +7,7 @@
   
       echo Running test $name.
   
  -    result=`HOME=$builddir $builddir/$prog $*`
  +    result=`HOME=$builddir $builddir/$prog $* 2>&1`
       if [ "$answer" != "$result" ]; then
        echo "Test \"$prog $*\" failed with: \"$result\" != \"$answer\" "
        exit 2
  @@ -114,7 +114,10 @@
   
   run test1 "test1 - 57" "arg1: 0 arg2: (none) aBits: foo,baz" --bits 
foo,bar,baz,!bar
   
  -run test1 "test1 - 58" "\
  +run test1 "test1 - 58" "test1: bad argument --arg1=illegal: option does not 
take an argument" --arg1=illegal
  +run test1 "test1 - 59" "test1: bad argument --=illegal: option does not take 
an argument" --=illegal
  +
  +run test1 "test1 - 60" "\
   Usage: test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
           [-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val]
           [-i|--int=INT] [-s|--short=SHORT] [-l|--long=LONG]
  @@ -123,7 +126,7 @@
           [--randlonglong=LONGLONG] [--argv=STRING] [--bitset] [--bitclr]
           [--bitxor] [--nstr=STRING] [--lstr=STRING] [-I|--inc]
           [-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" 
--usage
  -run test1 "test1 - 59" "\
  +run test1 "test1 - 61" "\
   Usage: test1 [OPTION...]
         --arg1                      First argument with a really long
                                     description. After all, we have to test
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                [email protected]

Reply via email to