[openssl-commits] [openssl] master update

[Emilia Kasper]

The branch master has been updated
       via  ab29eca645cdb38ffe73d141bbd7c6879b602860 (commit)
      from  a1fd1fb241069cc987d0d2cf13880bd16cada3c9 (commit)


- Log -----------------------------------------------------------------
commit ab29eca645cdb38ffe73d141bbd7c6879b602860
Author: Emilia Kasper <emilia at openssl.org>
Date:   Wed Nov 9 17:25:35 2016 +0100

    Run BoringSSL tests on Travis
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 .gitmodules                     |  3 +++
 .travis.yml                     | 16 ++++++++--------
 boringssl                       |  1 +
 test/recipes/90-test_external.t |  7 +++++--
 4 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 boringssl

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..0800f20
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "boringssl"]
+	path = boringssl
+	url = https://boringssl.googlesource.com/boringssl
diff --git a/.travis.yml b/.travis.yml
index b117f0e..90553c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,8 @@ addons:
             - ccache
             - clang-3.6
             - gcc-5
+            - g++-5
+            - golang
             - binutils-mingw-w64
             - gcc-mingw-w64
         sources:
@@ -39,8 +41,8 @@ matrix:
           compiler: clang-3.6
           env: CONFIG_OPTS="--strict-warnings no-deprecated" BUILDONLY="yes"
         - os: linux
-          compiler: gcc
-          env: CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-nextprotoneg enable-weak-ssl-ciphers" COVERALLS="yes"
+          compiler: gcc-5
+          env: CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-nextprotoneg enable-weak-ssl-ciphers enable-external-tests" COVERALLS="yes" BORINGSSL_TESTS="yes" CXX="g++-5"
         - os: linux
           compiler: clang-3.6
           env: CONFIG_OPTS="enable-msan"
@@ -100,11 +102,9 @@ script:
       else
           make="make";
       fi
+    - top=${PWD}
     - if [ -n "$DESTDIR" ]; then
           cd _build;
-          top=..;
-      else
-          top=.;
       fi
     - $make update
     - $make
@@ -113,13 +113,13 @@ script:
               sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install wine;
               export EXE_SHELL="wine" WINEPREFIX=`pwd`;
           fi;
-          HARNESS_VERBOSE=yes make test;
+          HARNESS_VERBOSE=yes BORING_RUNNER_DIR=$top/boringssl/ssl/test/runner make test;
       else
           $make build_tests;
       fi
     - if [ -n "$DESTDIR" ]; then
-          mkdir "../$DESTDIR";
-          $make install install_docs DESTDIR="../$DESTDIR";
+          mkdir "$top/$DESTDIR";
+          $make install install_docs DESTDIR="$top/$DESTDIR";
       fi
     - cd $top
 
diff --git a/boringssl b/boringssl
new file mode 160000
index 0000000..490469f
--- /dev/null
+++ b/boringssl
@@ -0,0 +1 @@
+Subproject commit 490469f850ec94c7ce46eb7d44fe1ccb3bdbdae6
diff --git a/test/recipes/90-test_external.t b/test/recipes/90-test_external.t
index a3da76c..3bdc4af 100644
--- a/test/recipes/90-test_external.t
+++ b/test/recipes/90-test_external.t
@@ -9,10 +9,13 @@
 
 use OpenSSL::Test;
 use OpenSSL::Test::Utils;
-use OpenSSL::Test qw/:DEFAULT srctop_file cmdstr/;
+use OpenSSL::Test qw/:DEFAULT bldtop_file srctop_file cmdstr/;
 
 setup("test_external");
 
+plan skip_all => "No external tests in this configuration"
+    if disabled("external-tests");
+
 if (!$ENV{BORING_RUNNER_DIR}) {
     plan skip_all => "No external tests have been detected";
 }
@@ -21,7 +24,7 @@ plan tests => 1;
 
 indir $ENV{BORING_RUNNER_DIR} => sub {
     ok(filter_run(cmd(["go", "test", "-shim-path",
-                      srctop_file("test", "ossl_shim", "ossl_shim"),
+                      bldtop_file("test", "ossl_shim", "ossl_shim"),
                       "-shim-config",
                       srctop_file("test", "ossl_shim", "ossl_config.json"),
                       "-pipe", "-allow-unimplemented"])),