forked from qt-creator/qt-creator
Squish: Add no settings path variable, for runs without pre-settings.
Change-Id: I12cc0080e2423c48a43937e0f7219357e80d4120 Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
This commit is contained in:
@@ -65,11 +65,11 @@ else:
|
||||
defaultQtVersion = "Desktop Qt 4.7.4 for GCC (Qt SDK)"
|
||||
srcPath = os.getenv("SYSTEST_SRCPATH", sdkPath + "/src")
|
||||
|
||||
cwd = os.path.abspath(cwd)
|
||||
tmpSettingsDir = tempDir()
|
||||
tmpSettingsDir = os.path.abspath(tmpSettingsDir+"/settings")
|
||||
shutil.copytree(cwd, tmpSettingsDir)
|
||||
# the following only doesn't work if the test ends in an exception
|
||||
atexit.register(__removeTmpSettingsDir__)
|
||||
SettingsPath = ' -settingspath "%s"' % tmpSettingsDir
|
||||
|
||||
if os.getenv("SYSTEST_NOSETTINGSPATH") != "1":
|
||||
cwd = os.path.abspath(cwd)
|
||||
tmpSettingsDir = tempDir()
|
||||
tmpSettingsDir = os.path.abspath(tmpSettingsDir+"/settings")
|
||||
shutil.copytree(cwd, tmpSettingsDir)
|
||||
atexit.register(__removeTmpSettingsDir__)
|
||||
SettingsPath = ' -settingspath "%s"' % tmpSettingsDir
|
||||
|
||||
Reference in New Issue
Block a user