summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobbie Harwood <rharwood@redhat.com>2017-04-05 12:54:41 -0400
committerRichard Levitte <levitte@openssl.org>2017-04-18 19:10:25 +0200
commit0fef74486ede58e34eeac2fab38c3f467ea31f95 (patch)
tree51e064418e36945698462f755e69491ebd9fb1e9
parent483bc2dcd3b4a33e13f0e71c145af7e453d3af10 (diff)
[extended tests] Enable krb5 tests in Travis
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2022)
-rw-r--r--.gitmodules4
-rw-r--r--.travis.yml3
m---------krb50
3 files changed, 7 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 696fdff396..af32ea618c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,3 +5,7 @@
[submodule "pyca.cryptography"]
path = pyca-cryptography
url = https://github.com/pyca/cryptography.git
+
+[submodule "krb5"]
+ path = krb5
+ url = https://github.com/krb5/krb5
diff --git a/.travis.yml b/.travis.yml
index cb08e40d42..61a9acc3b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -196,6 +196,9 @@ script:
sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install wine;
export EXE_SHELL="wine" WINEPREFIX=`pwd`;
fi;
+ if [ -e krb5/src ]; then
+ sudo apt-get -yq install bison dejagnu gettext keyutils ldap-utils libldap2-dev libkeyutils-dev python-cjson python-paste python-pyrad slapd tcl-dev tcsh;
+ fi;
HARNESS_VERBOSE=yes BORING_RUNNER_DIR=$top/boringssl/ssl/test/runner make test;
else
$make build_tests;
diff --git a/krb5 b/krb5
new file mode 160000
+Subproject b9ad6c49505c96a088326b62a52568e3484f216