From 88eec5ae47f010498986915336fcd89442c08d36 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 5 Apr 2012 19:19:01 +0200 Subject: [PATCH] Squish: Use sorted filenames also for Console MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8ac973e772b3d1856e5307319c75fb4d150cf818 Reviewed-by: Robert Löhning --- tests/system/shared/project.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index ce3b5c1139f..f36ad93d418 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -178,12 +178,7 @@ def createProject_Qt_GUI(path, projectName, qtVersion = None, checks = True): path = os.path.abspath(path) path = os.path.join(path, projectName) expectedFiles = [path] - tmpList = ["main.cpp", cpp_file, h_file, ui_file, pro_file] - if platform.system() in ('Windows', 'Microsoft'): - tmpList.sort(key=str.lower) - else: - tmpList.sort() - expectedFiles.extend(tmpList) + expectedFiles.extend(__sortFilenamesOSDependent__(["main.cpp", cpp_file, h_file, ui_file, pro_file])) __createProjectHandleLastPage__(expectedFiles) waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)", 20000) @@ -207,7 +202,8 @@ def createProject_Qt_Console(path, projectName, qtVersion = None, checks = True) path = os.path.join(path, projectName) cpp_file = "main.cpp" pro_file = projectName + ".pro" - expectedFiles = [path, cpp_file, pro_file] + expectedFiles = [path] + expectedFiles.extend(__sortFilenamesOSDependent__([cpp_file, pro_file])) __createProjectHandleLastPage__(expectedFiles) waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)", 10000) @@ -461,3 +457,10 @@ def prepareTemplate(sourceExample): templateDir = os.path.abspath(tempDir() + "/template") shutil.copytree(sourceExample, templateDir) return templateDir + +def __sortFilenamesOSDependent__(filenames): + if platform.system() in ('Windows', 'Microsoft'): + filenames.sort(key=str.lower) + else: + filenames.sort() + return filenames