[openssl-commits] [openssl] master update

[paul.dale at oracle.com]

The branch master has been updated
       via  21c7942140ff6e57cfcbf1afc9da8d8a8817ed2f (commit)
      from  79120f46a2d79432e14b879e8c0f04a210c37970 (commit)


- Log -----------------------------------------------------------------
commit 21c7942140ff6e57cfcbf1afc9da8d8a8817ed2f
Author: Pauli <paul.dale at oracle.com>
Date:   Mon Sep 4 06:38:16 2017 +1000

    Fix an include location problem in the extrended tests.
    [extended tests]
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4327)

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

Summary of changes:
 test/ossl_shim/build.info     | 2 +-
 test/ossl_shim/ossl_shim.cc   | 4 ++--
 test/ossl_shim/packeted_bio.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/ossl_shim/build.info b/test/ossl_shim/build.info
index 8cb3542..aa5f062 100644
--- a/test/ossl_shim/build.info
+++ b/test/ossl_shim/build.info
@@ -1,6 +1,6 @@
 IF[{- defined $target{cxx} && !$disabled{"external-tests"}-}]
   PROGRAMS_NO_INST=ossl_shim
   SOURCE[ossl_shim]=ossl_shim.cc async_bio.cc packeted_bio.cc test_config.cc
-  INCLUDE[ossl_shim]=. include ../../include ../..
+  INCLUDE[ossl_shim]=. include ../../include
   DEPEND[ossl_shim]=../../libssl ../../libcrypto
 ENDIF
diff --git a/test/ossl_shim/ossl_shim.cc b/test/ossl_shim/ossl_shim.cc
index f1febd8..cda32ef 100644
--- a/test/ossl_shim/ossl_shim.cc
+++ b/test/ossl_shim/ossl_shim.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -11,6 +11,7 @@
 #define __STDC_FORMAT_MACROS
 #endif
 
+#include "packeted_bio.h"
 #include <openssl/e_os2.h>
 
 #if !defined(OPENSSL_SYS_WINDOWS)
@@ -53,7 +54,6 @@ OPENSSL_MSVC_PRAGMA(comment(lib, "Ws2_32.lib"))
 #include <vector>
 
 #include "async_bio.h"
-#include "packeted_bio.h"
 #include "test_config.h"
 
 namespace bssl {
diff --git a/test/ossl_shim/packeted_bio.h b/test/ossl_shim/packeted_bio.h
index 9b4fb1d..bd3e3d1 100644
--- a/test/ossl_shim/packeted_bio.h
+++ b/test/ossl_shim/packeted_bio.h
@@ -10,7 +10,7 @@
 #ifndef HEADER_PACKETED_BIO
 #define HEADER_PACKETED_BIO
 
-#include "e_os.h"
+#include "../../e_os.h"
 #include <openssl/base.h>
 #include <openssl/bio.h>