summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2019-12-23 14:39:57 +0000
committerDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>2019-12-26 12:13:06 +0100
commitf798c27958cd3e92ee242e206a0074bd2d7423df (patch)
tree27e9fd6b272ad29a2a060fd2811d88d501ea51c7 /test
parentf3fdfbf78c6bfc97abf9c70b03859a28ebf6b66d (diff)
Don't run test_conf in cross compiled builds
test_conf was failing in travis for mingw builds. We run these on linux via wine. However due to line break differences the tests were failing. We just skip these in a cross compiled build. Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com> Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> (Merged from https://github.com/openssl/openssl/pull/10689)
Diffstat (limited to 'test')
-rw-r--r--test/recipes/04-test_conf.t4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/recipes/04-test_conf.t b/test/recipes/04-test_conf.t
index c28bcb1706..9103cbc8eb 100644
--- a/test/recipes/04-test_conf.t
+++ b/test/recipes/04-test_conf.t
@@ -10,6 +10,7 @@ use strict;
use warnings;
use OpenSSL::Test qw(:DEFAULT data_file);
+use OpenSSL::Test::Utils;
use File::Compare qw(compare_text);
setup('test_conf');
@@ -19,6 +20,9 @@ my %input_result = (
'dollarid_off.conf' => 'dollarid_off.txt',
);
+plan skip_all => 'This is unsupported for cross compiled configurations'
+ if config('CROSS_COMPILE');
+
plan tests => 2 * scalar(keys %input_result);
foreach (sort keys %input_result) {