diff options
| author | Mouse <[email protected]> | 2015-10-23 17:07:56 -0400 |
|---|---|---|
| committer | Mouse <[email protected]> | 2015-10-23 17:07:56 -0400 |
| commit | c4db6691f358c1c34757d3628f4ee45c002bbe91 (patch) | |
| tree | ccc66d4e790796baeb710c39d2010c7f1dbe2b73 | |
| parent | c8d5dc2f8feba7eb9e7a8fd41896eb26974f4417 (diff) | |
| parent | fb60240bb94d9f921baf5affd8f104af86de9877 (diff) | |
Merge pull request #5 from randombit/master
Sync up with random bit
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | src/scripts/ci/travis/build.sh | 8 | ||||
| -rwxr-xr-x | src/scripts/ci/travis/install_osx_packages.sh | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 2efbb1f91..b4f11be7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,6 +83,8 @@ addons: - zlib1g-dev - libbz2-dev - liblzma-dev + - python2 + - python3 coverity_scan: project: diff --git a/src/scripts/ci/travis/build.sh b/src/scripts/ci/travis/build.sh index 369450091..bb52f0648 100755 --- a/src/scripts/ci/travis/build.sh +++ b/src/scripts/ci/travis/build.sh @@ -60,4 +60,12 @@ if [ "$MODULES" != "min" ] && [ "${TARGETOS:0:3}" != "ios" ]; then ./botan-test fi +if [ "$MODULES" != "min" ] && [ "$BUILD_MODE" = "shared" ] && [ "$TARGETOS" = "desktop" ] +then + python2 --version + python3 --version + LD_LIBRARY_PATH=. python2 src/python/botan.py + LD_LIBRARY_PATH=. python3 src/python/botan.py +fi + make install diff --git a/src/scripts/ci/travis/install_osx_packages.sh b/src/scripts/ci/travis/install_osx_packages.sh index 1d4a5e001..588855cc0 100755 --- a/src/scripts/ci/travis/install_osx_packages.sh +++ b/src/scripts/ci/travis/install_osx_packages.sh @@ -6,3 +6,5 @@ which shellcheck > /dev/null && shellcheck "$0" # Run shellcheck on this if avai brew update || brew update brew install xz +brew install python # python2 +brew install python3 |