diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 14:10:00 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 14:10:44 +0100 |
| commit | 250e07e99accec41c37a0be5311c404dc22a0eac (patch) | |
| tree | 78a4602c69a55129ab7feb1d4137f05d075dbe27 /coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh | |
| parent | 18b5dbf7df629e3b92152d53d8db8dd8e7d8ba7f (diff) | |
| parent | a434f14bd93f387f5f981fcd7d27ce95384d1ce6 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
This was pushed directly, bypassing codereview.qt-project.org to get
provisioning back into a working state.
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: I4eadb7ffafdf5cbc821d1f0a96734b0f83243464
Diffstat (limited to 'coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh')
| -rwxr-xr-x | coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh b/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh index b68d62f8..610f7a8e 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh @@ -1,6 +1,10 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash set -ex +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + # Enables the usage of temporary keychains for SSL autotests -echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc +SetEnvVar "QT_SSL_USE_TEMPORARY_KEYCHAIN" "1" + |