From: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Date: Sat, 18 Mar 2017 14:34:33 +0000 (+0100)
Subject: Testsuite: fixup testsuite test about flavours
X-Git-Tag: exim-4_90_RC1~215
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=45f35410b4bdd59614dd9811ee99aea6a5d1164c;p=exim.git

Testsuite: fixup testsuite test about flavours

Support for flavours isn't dropped, but currently
we do not have flavour specific files.
---

diff --git a/test/lib/Exim/Runtest.pm b/test/lib/Exim/Runtest.pm
index 537cea1e9..e41a29c8c 100644
--- a/test/lib/Exim/Runtest.pm
+++ b/test/lib/Exim/Runtest.pm
@@ -137,7 +137,7 @@ sub flavour {
 
 sub flavours {
     my %h = map { /\.(\S+)$/, 1 }
-            glob('stdout/*.*'), glob('stderr/*.*');
+            grep { !/\.orig$/ } glob('stdout/*.*'), glob('stderr/*.*');
     return sort keys %h;
 }
 
diff --git a/test/t/00-basic.t b/test/t/00-basic.t
index 0612a20af..2fbd2decd 100644
--- a/test/t/00-basic.t
+++ b/test/t/00-basic.t
@@ -45,7 +45,8 @@ subtest 'flavour' => sub {
     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 flavour('t/samples/empty'), undef()           => 'got empty flavour (undef)';
-    is_deeply [flavours()], ['debian8'] => 'got available flavours';
+    # we do not have flavours anymore (2017-03-18)
+    # is_deeply [flavours()], ['debian8'] => 'got available flavours';
 };
 
 done_testing;