The entire concept of PendingError() is flawed :/.

[apt.git] / test / integration / test-apt-ftparchive-cachedb-lp1274466

diff --git a/test/integration/test-apt-ftparchive-cachedb-lp1274466 b/test/integration/test-apt-ftparchive-cachedb-lp1274466
index c230e47dcd9d5582213351b7f9f2fc037f0d5dc0..3a55272306ef549105317577a17e4aac645a7177 100755 (executable)
--- a/test/integration/test-apt-ftparchive-cachedb-lp1274466
+++ b/test/integration/test-apt-ftparchive-cachedb-lp1274466
@@ -11,14 +11,19 @@ setupenvironment
 configarchitecture "i386"
 confighashes 'MD5' 'SHA1' 'SHA256' 'SHA512'
 
 configarchitecture "i386"
 confighashes 'MD5' 'SHA1' 'SHA256' 'SHA512'
 

+db_dump=db_dump
+if command -v db_dump-5 >/dev/null 2>&1; then
+    db_dump=db_dump-5
+fi
+

 # gather the db and the deb, ensure mtime is not modfied as its saved in the DB
 cp -p "$TESTDIR/deb-lp1274466-cachedb.deb" foo_1_i386.deb
 cp -p "$TESTDIR/cachedb-lp1274466-old-format.db" old-format.db
 
 # verify that the format is different
 testsuccess aptftparchive --db new-format.db packages .
 # gather the db and the deb, ensure mtime is not modfied as its saved in the DB
 cp -p "$TESTDIR/deb-lp1274466-cachedb.deb" foo_1_i386.deb
 cp -p "$TESTDIR/cachedb-lp1274466-old-format.db" old-format.db
 
 # verify that the format is different
 testsuccess aptftparchive --db new-format.db packages .

-db_dump new-format.db > new-format.dump
-db_dump old-format.db > old-format.dump
+$db_dump new-format.db > new-format.dump
+$db_dump old-format.db > old-format.dump

 testfailure diff -u old-format.dump new-format.dump
 
 # ensure the new format as the sha512
 testfailure diff -u old-format.dump new-format.dump
 
 # ensure the new format as the sha512


@@ -47,7 +52,7 @@ Description: an autogenerated dummy foo=1/test
 " aptftparchive  --db old-format.db packages .
 
 # ensure that the db is updated and contains the new sha512
 " aptftparchive  --db old-format.db packages .
 
 # ensure that the db is updated and contains the new sha512

-db_dump old-format.db > old-format.dump
+$db_dump old-format.db > old-format.dump

 
 testsuccess grep 7da58ff901a40ecf42a730dc33198b182e9ba9ec98799fc2c2b6fabeeee40cc12a0e7cadb4b66764235c56e1009dbfe8a9a566fb1eedf47a992d1fff2cc3332c old-format.dump
 
 
 testsuccess grep 7da58ff901a40ecf42a730dc33198b182e9ba9ec98799fc2c2b6fabeeee40cc12a0e7cadb4b66764235c56e1009dbfe8a9a566fb1eedf47a992d1fff2cc3332c old-format.dump