feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Fix unknown global variable

Browse Source 
Amends 40caa8a4ba.

Change-Id: I014210c2035fa0a69ca273718df726a523a23786
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
This commit is contained in:
Christian Stenger
2022-02-03 08:52:11 +01:00
committed by Robert Löhning
parent 4e10170ccd
commit 4e716c0db5
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/system/shared/qtcreator.py
View File

@@ -39,6 +39,13 @@ try:
except ImportError: except ImportError:
import builtins as __builtin__ # Python 3 import builtins as __builtin__ # Python 3
# ensure global variables are defined before including shared scripts
qt4Path = os.path.expanduser("~/Qt4.8.7")
if platform.system() in ('Windows', 'Microsoft'):
qt4Path = "C:\\Qt\\Qt4.8.7"
qt4Available = os.path.exists(qt4Path)
srcPath = '' srcPath = ''
SettingsPath = [] SettingsPath = []
tmpSettingsDir = '' tmpSettingsDir = ''
@@ -329,18 +336,14 @@ def copySettingsToTmpDir(destination=None, omitFiles=[]):
# current dir is directory holding qtcreator.py # current dir is directory holding qtcreator.py
origSettingsDir = os.path.abspath(os.path.join(os.getcwd(), "..", "..", "settings")) origSettingsDir = os.path.abspath(os.path.join(os.getcwd(), "..", "..", "settings"))
qt4Path = os.path.expanduser("~/Qt4.8.7")
if platform.system() in ('Windows', 'Microsoft'): if platform.system() in ('Windows', 'Microsoft'):
qt4Path = "C:\\Qt\\Qt4.8.7"
origSettingsDir = os.path.join(origSettingsDir, "windows") origSettingsDir = os.path.join(origSettingsDir, "windows")
elif platform.system() == 'Darwin': elif platform.system() == 'Darwin':
origSettingsDir = os.path.join(origSettingsDir, "mac") origSettingsDir = os.path.join(origSettingsDir, "mac")
else: else:
origSettingsDir = os.path.join(origSettingsDir, "unix") origSettingsDir = os.path.join(origSettingsDir, "unix")
qt4Available = os.path.exists(qt4Path)
srcPath = os.getenv("SYSTEST_SRCPATH", os.path.expanduser(os.path.join("~", "squish-data"))) srcPath = os.getenv("SYSTEST_SRCPATH", os.path.expanduser(os.path.join("~", "squish-data")))
# the following only doesn't work if the test ends in an exception # the following only doesn't work if the test ends in an exception