From ce5fc68c8d6ebc52a84b005d5feaffd6bff0a2e4 Mon Sep 17 00:00:00 2001
From: Bill King <bill.king@nokia.com>
Date: Mon, 9 Jan 2012 15:33:14 +0100
Subject: [PATCH] Squish: Add no settings path variable, for runs without
pre-settings.
Change-Id: I12cc0080e2423c48a43937e0f7219357e80d4120
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
---
tests/system/shared/qtcreator.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py
index ebc6a987fd1..0c92f7c86a7 100644
--- a/tests/system/shared/qtcreator.py
+++ b/tests/system/shared/qtcreator.py
@@ -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
--
GitLab