diff --git a/tests/system/suite_CCOM/tst_CCOM01/test.py b/tests/system/suite_CCOM/tst_CCOM01/test.py index ae2f3199c00efc1602d7160ca3e144cbfa72070b..95a7cb497b9c3268c043796495accfd13238e7cd 100755 --- a/tests/system/suite_CCOM/tst_CCOM01/test.py +++ b/tests/system/suite_CCOM/tst_CCOM01/test.py @@ -5,11 +5,12 @@ source("../../shared/qtcreator.py") def main(): # prepare example project sourceExample = os.path.abspath(sdkPath + "/Examples/4.7/declarative/animation/basics/property-animation") - if not neededFilePresent(sourceExample): + proFile = "propertyanimation.pro" + if not neededFilePresent(os.path.join(sourceExample, proFile)): return # copy example project to temp directory templateDir = prepareTemplate(sourceExample) - examplePath = templateDir + "/propertyanimation.pro" + examplePath = os.path.join(templateDir, proFile) startApplication("qtcreator" + SettingsPath) # open example project openQmakeProject(examplePath) diff --git a/tests/system/suite_CCOM/tst_CCOM02/test.py b/tests/system/suite_CCOM/tst_CCOM02/test.py index dd0215dcf9215a875f54668bfb2c56ef322b7ea2..a687649f8cc9e2c2ce49a4d9805b63527010cc1f 100755 --- a/tests/system/suite_CCOM/tst_CCOM02/test.py +++ b/tests/system/suite_CCOM/tst_CCOM02/test.py @@ -5,11 +5,12 @@ source("../../shared/qtcreator.py") def main(): # prepare example project sourceExample = os.path.abspath(sdkPath + "/Examples/4.7/declarative/animation/basics/property-animation") - if not neededFilePresent(sourceExample): + proFile = "propertyanimation.pro" + if not neededFilePresent(os.path.join(sourceExample, proFile)): return # copy example project to temp directory templateDir = prepareTemplate(sourceExample) - examplePath = templateDir + "/propertyanimation.pro" + examplePath = os.path.join(templateDir, proFile) startApplication("qtcreator" + SettingsPath) # open example project openQmakeProject(examplePath) diff --git a/tests/system/suite_CSUP/tst_CSUP04/test.py b/tests/system/suite_CSUP/tst_CSUP04/test.py index cafe7cf58283b8d3154642428bd4dbd38ecb73a7..28d4ac145b87ac6dcf4fc98712b1f9bc319a0783 100644 --- a/tests/system/suite_CSUP/tst_CSUP04/test.py +++ b/tests/system/suite_CSUP/tst_CSUP04/test.py @@ -6,11 +6,12 @@ def main(): global searchFinished # prepare example project sourceExample = os.path.abspath(sdkPath + "/Examples/4.7/declarative/animation/basics/property-animation") - if not neededFilePresent(sourceExample): + proFile = "propertyanimation.pro" + if not neededFilePresent(os.path.join(sourceExample, proFile)): return # copy example project to temp directory templateDir = prepareTemplate(sourceExample) - examplePath = templateDir + "/propertyanimation.pro" + examplePath = os.path.join(templateDir, proFile) startApplication("qtcreator" + SettingsPath) # open example project openQmakeProject(examplePath) diff --git a/tests/system/suite_CSUP/tst_CSUP05/test.py b/tests/system/suite_CSUP/tst_CSUP05/test.py index bc5d5a1e0e1758fe1516197448855462bdef7810..2017fb6e948338ece975302b8ef563b0e913cb52 100644 --- a/tests/system/suite_CSUP/tst_CSUP05/test.py +++ b/tests/system/suite_CSUP/tst_CSUP05/test.py @@ -5,11 +5,12 @@ source("../../shared/qtcreator.py") def main(): # prepare example project sourceExample = os.path.abspath(sdkPath + "/Examples/4.7/declarative/animation/basics/property-animation") - if not neededFilePresent(sourceExample): + proFile = "propertyanimation.pro" + if not neededFilePresent(os.path.join(sourceExample, proFile)): return # copy example project to temp directory templateDir = prepareTemplate(sourceExample) - examplePath = templateDir + "/propertyanimation.pro" + examplePath = os.path.join(templateDir, proFile) startApplication("qtcreator" + SettingsPath) # open example project openQmakeProject(examplePath) diff --git a/tests/system/suite_QMLS/tst_QMLS03/test.py b/tests/system/suite_QMLS/tst_QMLS03/test.py index 9733291871f22fb46623cb7ff35f19cdc668c63b..75d7a842e09669e63d47417d06fee9c7fde89f7e 100644 --- a/tests/system/suite_QMLS/tst_QMLS03/test.py +++ b/tests/system/suite_QMLS/tst_QMLS03/test.py @@ -42,11 +42,12 @@ def checkUsages(resultsView, expectedResults): def main(): # prepare example project sourceExample = os.path.abspath(sdkPath + "/Examples/4.7/declarative/animation/basics/property-animation") - if not neededFilePresent(sourceExample): + proFile = "propertyanimation.pro" + if not neededFilePresent(os.path.join(sourceExample, proFile)): return # copy example project to temp directory templateDir = prepareTemplate(sourceExample) - examplePath = templateDir + "/propertyanimation.pro" + examplePath = os.path.join(templateDir, proFile) startApplication("qtcreator" + SettingsPath) # open example project openQmakeProject(examplePath) diff --git a/tests/system/suite_general/tst_create_proj_wizard/test.py b/tests/system/suite_general/tst_create_proj_wizard/test.py index 60f29c4a9ca9e77f6298a82d46dc3d5819c71339..c044c9e7788400ba14db83a199c284e655fa3a9c 100644 --- a/tests/system/suite_general/tst_create_proj_wizard/test.py +++ b/tests/system/suite_general/tst_create_proj_wizard/test.py @@ -5,7 +5,8 @@ import re def main(): global templateDir, textChanged sourceExample = os.path.abspath(sdkPath + "/Examples/4.7/declarative/text/textselection") - if not neededFilePresent(sourceExample): + qmlFile = os.path.join("qml", "textselection.qml") + if not neededFilePresent(os.path.join(sourceExample, qmlFile)): return templateDir = prepareTemplate(sourceExample) startApplication("qtcreator" + SettingsPath) @@ -65,7 +66,7 @@ def main(): try: waitForObject("{text='Select Existing QML file' type='QLabel' visible='1'}", 1000) baseLineEd = waitForObject("{type='Utils::BaseValidatingLineEdit' unnamed='1' visible='1'}", 20000) - type(baseLineEd, templateDir + "/qml/textselection.qml") + type(baseLineEd, os.path.join(templateDir, qmlFile)) clickButton(waitForObject(":Next_QPushButton")) except LookupError: pass diff --git a/tests/system/suite_qtquick/tst_qml_editor/test.py b/tests/system/suite_qtquick/tst_qml_editor/test.py index 825d070df0cd4976188578a7fec6c8bc09e56388..73605f7a303a31af28e50a779b31005ecffde19c 100644 --- a/tests/system/suite_qtquick/tst_qml_editor/test.py +++ b/tests/system/suite_qtquick/tst_qml_editor/test.py @@ -7,7 +7,8 @@ searchFinished = False def main(): global workingDir,templateDir sourceExample = os.path.abspath(sdkPath + "/Examples/4.7/declarative/keyinteraction/focus") - if not neededFilePresent(sourceExample): + qmlFile = os.path.join("qml", "focus.qml") + if not neededFilePresent(os.path.join(sourceExample, qmlFile)): return startApplication("qtcreator" + SettingsPath) # add docs to have the correct tool tips @@ -17,7 +18,7 @@ def main(): templateDir = prepareTemplate(sourceExample) prepareForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)") installLazySignalHandler("{type='Core::FutureProgress' unnamed='1'}", "finished()", "__handleFutureProgress__") - createNewQtQuickApplication(workingDir, "untitled", templateDir + "/qml/focus.qml") + createNewQtQuickApplication(workingDir, "untitled", os.path.join(templateDir, qmlFile)) # wait for parsing to complete waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)") testRenameId() diff --git a/tests/system/suite_qtquick/tst_qtquick_creation2/test.py b/tests/system/suite_qtquick/tst_qtquick_creation2/test.py index e590351fb5d4f1f7e125e498d9efad2f3ed8469a..521b729e5469bbb1217973bd4996f701ad6f248d 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation2/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation2/test.py @@ -6,13 +6,14 @@ templateDir = None def main(): global workingDir,templateDir sourceExample = os.path.abspath(sdkPath + "/Examples/4.7/declarative/text/textselection") - if not neededFilePresent(sourceExample): + qmlFile = os.path.join("qml", "textselection.qml") + if not neededFilePresent(os.path.join(sourceExample, qmlFile)): return startApplication("qtcreator" + SettingsPath) # using a temporary directory won't mess up an eventually exisiting workingDir = tempDir() templateDir = prepareTemplate(sourceExample) - projectName = createNewQtQuickApplication(workingDir, None, templateDir + "/qml/textselection.qml") + projectName = createNewQtQuickApplication(workingDir, None, os.path.join(templateDir, qmlFile)) # wait for parsing to complete waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)") test.log("Building project")