[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  0777de15ff09105593c7e778cf47f97a9144d273 (commit)
      from  3be389435fc7b94623d972b622dbd9f0cd5c34f7 (commit)


- Log -----------------------------------------------------------------
commit 0777de15ff09105593c7e778cf47f97a9144d273
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Nov 23 18:53:32 2018 +0100

    Avoid test_errstr in a cross compiled configuration
    
    There's too high a chance that the openssl app and perl get different
    messages for some error numbers.
    
    [extended tests]
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7699)

-----------------------------------------------------------------------

Summary of changes:
 test/recipes/02-test_errstr.t | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test/recipes/02-test_errstr.t b/test/recipes/02-test_errstr.t
index 3d806f0..745c3c0 100644
--- a/test/recipes/02-test_errstr.t
+++ b/test/recipes/02-test_errstr.t
@@ -9,6 +9,7 @@
 use strict;
 no strict 'refs';               # To be able to use strings as function refs
 use OpenSSL::Test;
+use OpenSSL::Test::Utils;
 use Errno qw(:POSIX);
 use POSIX qw(strerror);
 
@@ -22,6 +23,14 @@ use constant NUM_SYS_STR_REASONS => 127;
 
 setup('test_errstr');
 
+# In a cross compiled situation, there are chances that our
+# application is linked against different C libraries than
+# perl, and may thereby get different error messages for the
+# same error.
+# The safest is not to test under such circumstances.
+plan skip_all => 'This is unsupported for cross compiled configurations'
+    if config('CROSS_COMPILE');
+
 # These are POSIX error names, which Errno implements as functions
 # (this is documented)
 my @posix_errors = @{$Errno::EXPORT_TAGS{POSIX}};