diff options
| author | Robert Loehning <robert.loehning@qt.io> | 2016-06-01 17:49:31 +0200 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@qt.io> | 2016-06-02 09:35:16 +0000 |
| commit | 79623d57742e234f9b5dfbb8d9d2b549503da951 (patch) | |
| tree | 6ef0fd755496e89e54f78e9ef64931ca8785b1c8 | |
| parent | b04b5e5d75b188a6eac4fcc1537327423cae5efb (diff) | |
| download | qt-creator-79623d57742e234f9b5dfbb8d9d2b549503da951.tar.gz | |
Squish: Base getPaths() on new path functions
Change-Id: I54cd03bc1d24b715df15de37291f776f9867416f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | tests/system/shared/classes.py | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py index 51248b40bc..a03be7eeb2 100644 --- a/tests/system/shared/classes.py +++ b/tests/system/shared/classes.py @@ -178,29 +178,16 @@ class Qt5Path: @staticmethod def getPaths(pathSpec): + qt5targets = [Targets.DESKTOP_521_DEFAULT, Targets.DESKTOP_531_DEFAULT] + if platform.system() != 'Darwin': + qt5targets.append(Targets.DESKTOP_541_GCC) if pathSpec == Qt5Path.DOCS: - path52 = "/doc" - path53 = "/Docs/Qt-5.3" - path54 = "/Docs/Qt-5.4" + return map(lambda target: Qt5Path.docsPath(target), qt5targets) elif pathSpec == Qt5Path.EXAMPLES: - path52 = "/examples" - path53 = "/Examples/Qt-5.3" - path54 = "/Examples/Qt-5.4" + return map(lambda target: Qt5Path.examplesPath(target), qt5targets) 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, "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.4.1" + path54]) - return map(os.path.expanduser, ["~/Qt5.2.1/5.2.1/gcc" + path52, - "~/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]) @staticmethod def __preCheckAndExtractQtVersionStr__(target): |