[Lsb-messages] /var/www/bzr/lsb/4.1/printing-test r91: Backport multi-arch lib detection mods from devel

Stew Benedict stewb at linux-foundation.org
Wed Aug 8 14:22:33 UTC 2012


------------------------------------------------------------
revno: 91
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: printing-test
timestamp: Wed 2012-08-08 10:22:33 -0400
message:
  Backport multi-arch lib detection mods from devel
modified:
  scripts/package/Makefile
  sources/printing-test/run_tests
-------------- next part --------------
=== modified file 'scripts/package/Makefile'
--- a/scripts/package/Makefile	2012-04-24 21:09:03 +0000
+++ b/scripts/package/Makefile	2012-08-08 14:22:33 +0000
@@ -2,7 +2,7 @@
 # XXX a specfile from this info, but not yet: for now keep in sync
 PACKAGE=lsb-test-printing
 VERSION=4.1.2
-RELEASE=1
+RELEASE=2
 
 # CUPS version, tarball
 CUPSVER=1.1.23

=== modified file 'sources/printing-test/run_tests'
--- a/sources/printing-test/run_tests	2010-05-04 15:30:11 +0000
+++ b/sources/printing-test/run_tests	2012-08-08 14:22:33 +0000
@@ -8,10 +8,11 @@
 export LC_MESSAGES=C
 export PATH=$PATH:/opt/lsb-tet3-lite/bin:/opt/lsb/test/printing/BIN
 CUPSD_CONFIG=$TET_ROOT/cups/etc/cups/cupsd.conf
+ARCH=`uname -m | sed 's|i[3-8]86|i386|;s|ppc$|powerpc|'`
 
 check_requires() {
   for lib in libcups.so.2 libcupsimage.so.2;do
-    if [ ! -f "/usr/lib/$lib" -a ! -f "/usr/lib64/$lib" ];then
+    if [ ! -f "/usr/lib/$lib" -a ! -f "/usr/lib64/$lib" -a ! -f "/usr/lib/$ARCH-linux-gnu/$lib" ];then
       echo "$lib not found"
       echo "you should install the package that provides $lib and then re-run the tests"
       sleep $SLEEP_TIME



More information about the lsb-messages mailing list