diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-06-13 18:06:45 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-06-24 06:50:49 +0000 |
| commit | 3d0431fb1a2231da1b2cccdb8f221f2beb62d125 (patch) | |
| tree | 4094886bb4d27ff861f9db360409578106662be3 | |
| parent | 08ea491488d147f6be0c6ca97d441ef2925b6901 (diff) | |
scripts: Fix QBS_AUTOTEST_SETTINGS_DIR usage
For now, it not possible to pass an existing profile using the
QBS_AUTOTEST_PROFILE (as was intended) since tests will try to find it
in /tmp/qbs-settings, not in the default settings directory.
Fix that by moving default value under the if clause.
Change-Id: I9706e862bad77bd5d074fdef4edc0255b5a1d3f0
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rwxr-xr-x | scripts/build-qbs-with-qbs.sh | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/scripts/build-qbs-with-qbs.sh b/scripts/build-qbs-with-qbs.sh index b70e2bbe7..dcd267392 100755 --- a/scripts/build-qbs-with-qbs.sh +++ b/scripts/build-qbs-with-qbs.sh @@ -40,12 +40,6 @@ set -e # -# It might be desired to keep settings for Qbs testing -# in a separate folder. -# -export QBS_AUTOTEST_SETTINGS_DIR="${QBS_AUTOTEST_SETTINGS_DIR:-/tmp/qbs-settings}" - -# # Qbs is built with the address sanitizer enabled. # Suppress findings in some parts of Qbs / dependencies. # @@ -83,6 +77,7 @@ fi if [ -z "${QBS_AUTOTEST_PROFILE}" ]; then export QBS_AUTOTEST_PROFILE=autotestprofile + export QBS_AUTOTEST_SETTINGS_DIR=`mktemp -d 2>/dev/null || mktemp -d -t 'qbs-settings'` RUN_OPTIONS="\ --settings-dir ${QBS_AUTOTEST_SETTINGS_DIR} \ |