From: Matt Caswell <matt@openssl.org>
Date: Mon, 23 Dec 2019 14:39:57 +0000 (+0000)
Subject: Don't run test_conf in cross compiled builds
X-Git-Tag: openssl-3.0.0-alpha1~761
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f798c27958cd3e92ee242e206a0074bd2d7423df;p=oweals%2Fopenssl.git

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)
---

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) {