From 6f2606cd7b86e715bfcc3e0b24d802086c3362f9 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Wed, 15 Jan 2020 16:35:51 +0000
Subject: [PATCH] tests/version: Fix Debianisms

This test asserted that libz.so.1 was in /lib/*-linux-gnu* or
/usr/lib/*-linux-gnu*, but on non-Debian operating systems it could
equally well be in /usr/lib32, /usr/lib, /usr/lib64 or even /usr/libx32.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 tests/version.pl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/version.pl b/tests/version.pl
index 772048ef7..885b82d49 100755
--- a/tests/version.pl
+++ b/tests/version.pl
@@ -52,7 +52,7 @@ $path = $4;
 is($root, $host);
 is($soname, 'libz.so.1');
 like($version, qr{^1\.[0-9]+\.[0-9]+$});
-like($path, qr{^\Q$host\E(/(?:usr/)?lib/.*-linux-gnu.*/libz\.so\.\Q$version\E)$});
+like($path, qr{^\Q$host\E(/(?:usr/)?lib(?:32|64|x32|/.*-linux-gnu.*)?/libz\.so\.\Q$version\E)$});
 $path =~ s/^\Q$host\E//;
 ok(-e $path);
 
@@ -71,7 +71,7 @@ TODO: {
     local $TODO = 'returns 1 for some reason';
     like($version, qr{^1\.[0-9]+\.[0-9]+$});
 }
-like($path, qr{^(/?(?:usr/)?lib/.*-linux-gnu.*/libz\.so\.\Q$version\E)$});
+like($path, qr{^(/?(?:usr/)?lib(?:32|64|x32|/.*-linux-gnu.*)?/libz\.so\.\Q$version\E)$});
 ok(-e $1);
 
 # A different way
@@ -89,7 +89,7 @@ TODO: {
     local $TODO = 'returns 1 for some reason';
     like($version, qr{^1\.[0-9]+\.[0-9]+$});
 }
-like($path, qr{^(/?(?:usr/)?lib/.*-linux-gnu.*/libz\.so\.\Q$version\E)$});
+like($path, qr{^(/?(?:usr/)?lib(?:32|64|x32|/.*-linux-gnu.*)?/libz\.so\.\Q$version\E)$});
 ok(-e $path);
 
 # Another different way
@@ -108,7 +108,7 @@ TODO: {
     local $TODO = 'returns 1 for some reason';
     like($version, qr{^1\.[0-9]+\.[0-9]+$});
 }
-like($path, qr{^(/?(?:usr/)?lib/.*-linux-gnu.*/libz\.so\.\Q$3\E)$});
+like($path, qr{^(/?(?:usr/)?lib(?:32|64|x32|/.*-linux-gnu.*)?/libz\.so\.\Q$3\E)$});
 ok(-e $path);
 
 done_testing;
-- 
GitLab