[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  bec5e4ae0dbacfc29595e5eb007d73180f305cc6 (commit)
       via  1c0e7dadab1f51cf39367d9d2ff6690a68854755 (commit)
      from  a6adf099cbd7c3bc5c7051ad3d334636ef5e7f90 (commit)


- Log -----------------------------------------------------------------
commit bec5e4ae0dbacfc29595e5eb007d73180f305cc6
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Mar 19 01:01:52 2016 +0100

    Don't perform tsa tests if configured "no-ts"
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 1c0e7dadab1f51cf39367d9d2ff6690a68854755
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Mar 19 01:01:07 2016 +0100

    Correct incorrect path
    
    In crypto, buildinf.h depends on ../configdata.pm, not ./configdata.pm
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/build.info          | 2 +-
 test/recipes/80-test_tsa.t | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/crypto/build.info b/crypto/build.info
index ba69b75..64bf2b4 100644
--- a/crypto/build.info
+++ b/crypto/build.info
@@ -12,7 +12,7 @@ EXTRA=  ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \
 
 DEPEND[cversion.o]=buildinf.h
 GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(CFLAGS_Q)" "$(PLATFORM)"
-DEPEND[buildinf.h]=configdata.pm
+DEPEND[buildinf.h]=../configdata.pm
 
 GENERATE[uplink-x86.s]=../ms/uplink-x86.pl $(PERLASM_SCHEME)
 
diff --git a/test/recipes/80-test_tsa.t b/test/recipes/80-test_tsa.t
index 477de2d..6785698 100644
--- a/test/recipes/80-test_tsa.t
+++ b/test/recipes/80-test_tsa.t
@@ -7,9 +7,13 @@ use POSIX;
 use File::Spec::Functions qw/splitdir curdir catfile/;
 use File::Compare;
 use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file/;
+use OpenSSL::Test::Utils;
 
 setup("test_tsa");
 
+plan skip_all => "TS is not supported by this OpenSSL build"
+    if disabled("ts");
+
 # All these are modified inside indir further down. They need to exist
 # here, however, to be available in all subroutines.
 my $testtsa;