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

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  [EMAIL PROTECTED]
  Module: rpm                              Date:   11-Oct-2007 19:35:07
  Branch: HEAD                             Handle: 2007101118350700

  Modified files:
    rpm                     devtool.conf

  Log:
    improve minimal embedded testsuite by using -vv, doing some more
    operations and especially output only anything if the testsuite failed

  Summary:
    Revision    Changes     Path
    2.106       +13 -4      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.105 -r2.106 devtool.conf
  --- rpm/devtool.conf  11 Oct 2007 08:50:45 -0000      2.105
  +++ rpm/devtool.conf  11 Oct 2007 17:35:07 -0000      2.106
  @@ -832,10 +832,19 @@
   
       #   test RPM (trivially only)
       standalone_testdrive () {
  -        $prefix/bin/rpm --initdb
  -        $prefix/bin/rpm --import ${DEVTOOL_SRCDIR}/pubkeys/JBJ-GPG-KEY
  -        $prefix/bin/rpm -qa
  -        $prefix/bin/rpm -Va
  +        (   set -x
  +            $prefix/bin/rpm -vv --initdb || exit $?
  +            $prefix/bin/rpm -vv --import 
${DEVTOOL_SRCDIR}/pubkeys/JBJ-GPG-KEY || exit $?
  +            $prefix/bin/rpm -vv -qa || exit $?
  +            $prefix/bin/rpm -vv -qi gpg-pubkey-2039b291-3dbaae72 || exit $?
  +            $prefix/bin/rpm -vv -e gpg-pubkey-2039b291-3dbaae72 || exit $?
  +            $prefix/bin/rpm -vv -Va || exit $?
  +        ) >/tmp/rpm.devtool.standalone.testdrive 2>&1
  +        if [ $? -ne 0 ]; then
  +            echo "devtool:standalone:testdrive:ERROR: trivial testsuite 
failed (trace follows):"
  +            cat /tmp/rpm.devtool.standalone.testdrive
  +        fi
  +        rm -f /tmp/rpm.devtool.standalone.testdrive
       }
   
       #   do all at once
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to