From: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Date: Sat, 12 Nov 2016 21:48:37 +0000 (+0100)
Subject: Testsuite: Assume '' for missing VERSION_ID
X-Git-Tag: exim-4_88_RC5~10
X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/9214c762c1b3717ff92351c8a217cee6726d993b

Testsuite: Assume '' for missing VERSION_ID
---

diff --git a/test/lib/Exim/Runtest.pm b/test/lib/Exim/Runtest.pm
index 32537f543..ce91084f4 100644
--- a/test/lib/Exim/Runtest.pm
+++ b/test/lib/Exim/Runtest.pm
@@ -119,7 +119,7 @@ sub flavour {
     if (open(my $f, '<', "$etc/os-release")) {
         local $_ = join '', <$f>;
         my ($id) = /^ID="?(.*?)"?\s*$/m;
-        my ($version) = /^VERSION_ID="?(.*?)"?\s*$/m;
+        my $version = /^VERSION_ID="?(.*?)"?\s*$/m ? $1 : '';
         return "$id$version";
     }
 
diff --git a/test/t/00-basic.t b/test/t/00-basic.t
index 49d6f6871..092591e44 100644
--- a/test/t/00-basic.t
+++ b/test/t/00-basic.t
@@ -40,9 +40,10 @@ subtest 'exim_binary' => sub {
 };
 
 subtest 'flavour' => sub {
-    is flavour('t/samples/etc.debian8-os-release'), 'debian8' => 'got flavour debian8 from os-release';
-    is flavour('t/samples/etc.debian8-debian-version'), 'debian8' => 'got flavour debian8 from debian_version';
-    is flavour('t/samples/etc.fedora24'), 'fedora24' => 'got flavour fedora24 from os-release';
+    is flavour('t/samples/debian8+os-release/etc'), 'debian8' => 'got flavour debian8 from os-release';
+    is flavour('t/samples/debian8+debian-version/etc'), 'debian8' => 'got flavour debian8 from debian_version';
+    is flavour('t/samples/debian.sid/etc'), 'debian' => 'got flavour debian from debian sid w/o VERSION_ID';
+    is flavour('t/samples/fedora24/etc'), 'fedora24' => 'got flavour fedora24 from os-release';
     is_deeply [flavours()], ['debian8'] => 'got available flavours';
 };
 
diff --git a/test/t/samples/debian.sid/etc/os-release b/test/t/samples/debian.sid/etc/os-release
new file mode 100644
index 000000000..959aa161b
--- /dev/null
+++ b/test/t/samples/debian.sid/etc/os-release
@@ -0,0 +1,6 @@
+PRETTY_NAME="Debian GNU/Linux stretch/sid"
+NAME="Debian GNU/Linux"
+ID=debian
+HOME_URL="https://www.debian.org/"
+SUPPORT_URL="https://www.debian.org/support"
+BUG_REPORT_URL="https://bugs.debian.org/"
diff --git a/test/t/samples/debian8+debian-version/etc/debian_version b/test/t/samples/debian8+debian-version/etc/debian_version
new file mode 100644
index 000000000..48c26da3e
--- /dev/null
+++ b/test/t/samples/debian8+debian-version/etc/debian_version
@@ -0,0 +1 @@
+8.6
diff --git a/test/t/samples/debian8+os-release/etc/debian_version b/test/t/samples/debian8+os-release/etc/debian_version
new file mode 100644
index 000000000..48c26da3e
--- /dev/null
+++ b/test/t/samples/debian8+os-release/etc/debian_version
@@ -0,0 +1 @@
+8.6
diff --git a/test/t/samples/debian8+os-release/etc/os-release b/test/t/samples/debian8+os-release/etc/os-release
new file mode 100644
index 000000000..120c51b08
--- /dev/null
+++ b/test/t/samples/debian8+os-release/etc/os-release
@@ -0,0 +1,8 @@
+PRETTY_NAME="Debian GNU/Linux 8 (jessie)"
+NAME="Debian GNU/Linux"
+VERSION_ID="8"
+VERSION="8 (jessie)"
+ID=debian
+HOME_URL="http://www.debian.org/"
+SUPPORT_URL="http://www.debian.org/support"
+BUG_REPORT_URL="https://bugs.debian.org/"
diff --git a/test/t/samples/etc.debian8-debian-version/debian_version b/test/t/samples/etc.debian8-debian-version/debian_version
deleted file mode 100644
index 48c26da3e..000000000
--- a/test/t/samples/etc.debian8-debian-version/debian_version
+++ /dev/null
@@ -1 +0,0 @@
-8.6
diff --git a/test/t/samples/etc.debian8-os-release/debian_version b/test/t/samples/etc.debian8-os-release/debian_version
deleted file mode 100644
index 48c26da3e..000000000
--- a/test/t/samples/etc.debian8-os-release/debian_version
+++ /dev/null
@@ -1 +0,0 @@
-8.6
diff --git a/test/t/samples/etc.debian8-os-release/os-release b/test/t/samples/etc.debian8-os-release/os-release
deleted file mode 100644
index 120c51b08..000000000
--- a/test/t/samples/etc.debian8-os-release/os-release
+++ /dev/null
@@ -1,8 +0,0 @@
-PRETTY_NAME="Debian GNU/Linux 8 (jessie)"
-NAME="Debian GNU/Linux"
-VERSION_ID="8"
-VERSION="8 (jessie)"
-ID=debian
-HOME_URL="http://www.debian.org/"
-SUPPORT_URL="http://www.debian.org/support"
-BUG_REPORT_URL="https://bugs.debian.org/"
diff --git a/test/t/samples/etc.fedora24/os-release b/test/t/samples/etc.fedora24/os-release
deleted file mode 100644
index f962ae641..000000000
--- a/test/t/samples/etc.fedora24/os-release
+++ /dev/null
@@ -1,14 +0,0 @@
-NAME=Fedora
-VERSION="24 (Twenty Four)"
-ID=fedora
-VERSION_ID=24
-PRETTY_NAME="Fedora 24 (Twenty Four)"
-ANSI_COLOR="0;34"
-CPE_NAME="cpe:/o:fedoraproject:fedora:24"
-HOME_URL="https://fedoraproject.org/"
-BUG_REPORT_URL="https://bugzilla.redhat.com/"
-REDHAT_BUGZILLA_PRODUCT="Fedora"
-REDHAT_BUGZILLA_PRODUCT_VERSION=24
-REDHAT_SUPPORT_PRODUCT="Fedora"
-REDHAT_SUPPORT_PRODUCT_VERSION=24
-PRIVACY_POLICY_URL=https://fedoraproject.org/wiki/Legal:PrivacyPolicy
diff --git a/test/t/samples/fedora24/etc/os-release b/test/t/samples/fedora24/etc/os-release
new file mode 100644
index 000000000..f962ae641
--- /dev/null
+++ b/test/t/samples/fedora24/etc/os-release
@@ -0,0 +1,14 @@
+NAME=Fedora
+VERSION="24 (Twenty Four)"
+ID=fedora
+VERSION_ID=24
+PRETTY_NAME="Fedora 24 (Twenty Four)"
+ANSI_COLOR="0;34"
+CPE_NAME="cpe:/o:fedoraproject:fedora:24"
+HOME_URL="https://fedoraproject.org/"
+BUG_REPORT_URL="https://bugzilla.redhat.com/"
+REDHAT_BUGZILLA_PRODUCT="Fedora"
+REDHAT_BUGZILLA_PRODUCT_VERSION=24
+REDHAT_SUPPORT_PRODUCT="Fedora"
+REDHAT_SUPPORT_PRODUCT_VERSION=24
+PRIVACY_POLICY_URL=https://fedoraproject.org/wiki/Legal:PrivacyPolicy