aboutsummaryrefslogtreecommitdiffstats
path: root/tests/system/suite_WELP
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@theqtcompany.com>2015-03-11 15:44:21 +0100
committerRobert Loehning <robert.loehning@theqtcompany.com>2015-03-11 15:33:12 +0000
commitcb42ff0deb455b8d9c0d1e667a246b683a06f006 (patch)
tree66628c54d3d2c4037b4ee3038790496265bcbc38 /tests/system/suite_WELP
parent20a0b97e82e306e065a421488d66adbcb9fd543a (diff)
Squish: Fix WELP03
Change-Id: Idf0c03b8a4746f63ab16c7391bc69d65629d7643 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Diffstat (limited to 'tests/system/suite_WELP')
-rw-r--r--tests/system/suite_WELP/tst_WELP03/test.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/system/suite_WELP/tst_WELP03/test.py b/tests/system/suite_WELP/tst_WELP03/test.py
index cce74da5b8..3e15c8f424 100644
--- a/tests/system/suite_WELP/tst_WELP03/test.py
+++ b/tests/system/suite_WELP/tst_WELP03/test.py
@@ -40,20 +40,23 @@ class Qt5Path:
if pathSpec == Qt5Path.DOCS:
path52 = "/doc"
path53 = "/Docs/Qt-5.3"
+ path54 = "/Docs/Qt-5.4"
elif pathSpec == Qt5Path.EXAMPLES:
path52 = "/examples"
path53 = "/Examples/Qt-5.3"
+ path54 = "/Examples/Qt-5.4"
else:
test.fatal("Unknown pathSpec given: %s" % str(pathSpec))
return []
if platform.system() in ('Microsoft', 'Windows'):
- return ["C:/Qt/Qt5.2.1/5.2.1/msvc2010" + path52, "C:/Qt/Qt5.3.1" + path53]
+ return ["C:/Qt/Qt5.2.1/5.2.1/msvc2010" + path52,
+ "C:/Qt/Qt5.3.1" + path53, "C:/Qt/Qt5.4.1" + path54]
elif platform.system() == 'Linux':
if __is64BitOS__():
return map(os.path.expanduser, ["~/Qt5.2.1/5.2.1/gcc_64" + path52,
- "~/Qt5.3.1" + path53])
+ "~/Qt5.3.1" + path53, "~/Qt5.4.1" + path54])
return map(os.path.expanduser, ["~/Qt5.2.1/5.2.1/gcc" + path52,
- "~/Qt5.3.1" + path53])
+ "~/Qt5.3.1" + path53, "~/Qt5.4.1" + path54])
else:
return map(os.path.expanduser, ["~/Qt5.2.1/5.2.1/clang_64" + path52,
"~/Qt5.3.1" + path53])