be able to run abicheck from any directory

Git-Dch: Ignore

diff --git a/.gitignore b/.gitignore
index 488682ee7c59d95fa6b5e84474b7d21de6f77322..a00c84a025ae82d56d7141d202802849bc43ea14 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,9 @@
 /vendor/current
 /vendor/*/sources.list
 /vendor/*/makefile.auto
 /vendor/current
 /vendor/*/sources.list
 /vendor/*/makefile.auto

+
+# generated for and by abicheck
+/abicheck/apt_build.xml
+/abicheck/apt_installed.xml
+/abicheck/compat_reports/
+/abicheck/logs/

diff --git a/abicheck/run_abi_test b/abicheck/run_abi_test
index 8f2d7d203143da54d820be0b1407af76f20de002..18c13dfcbcb95dbc601877387896c030eec1cacf 100755 (executable)
--- a/abicheck/run_abi_test
+++ b/abicheck/run_abi_test
@@ -1,5 +1,8 @@
 #!/bin/sh
 
 #!/bin/sh
 

+# ensure we are in the abibreak subdirectory
+cd "$(readlink -f $(dirname $0))"
+

 if [ ! -d ../build ]; then
        echo "../build missing, did you run make?"
        exit 1
 if [ ! -d ../build ]; then
        echo "../build missing, did you run make?"
        exit 1


@@ -10,7 +13,7 @@ if [ ! -x "$(which abi-compliance-checker 2>/dev/null )" ]; then
        exit 1
 fi
 
        exit 1
 fi
 

-LIBPATH=$(find /usr/lib/ -type f  -name "libapt-*.so.*" -printf %p\\\\n)
+LIBPATH=$(find /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) -type f -regex '.*/libapt-\(pkg\|inst\)\.so\..*' -printf %p\\\\n)

 sed s#@installed_libapt@#$LIBPATH# apt_installed.xml.in > apt_installed.xml
 
 BUILDPATH=$(readlink -f ../build)
 sed s#@installed_libapt@#$LIBPATH# apt_installed.xml.in > apt_installed.xml
 
 BUILDPATH=$(readlink -f ../build)