Remove the need to set global scripts directory.

Change-Id: I8f937120f7b151b0c68480a898fd953ae542bf69
Reviewed-on: http://codereview.qt.nokia.com/3662
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>

diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py
index a960c94..67f1d3f 100644 (file)
--- a/tests/system/shared/qtcreator.py
+++ b/tests/system/shared/qtcreator.py
@@ -7,8 +7,8 @@ SDKPath = ''
 SettingsPath = ''
 testSettings.logScreenshotOnFail = True
 
-source(findFile("scripts", "utils.py"))
-source(findFile("scripts", "mainwin.py"))
+source("../../shared/utils.py")
+source("../../shared/mainwin.py")
 
 if platform.system() in ('Windows', 'Microsoft'):
     SDKPath = "C:/QtSDK/src"

diff --git a/tests/system/suite_general/tst_basic_cpp_support/test.py b/tests/system/suite_general/tst_basic_cpp_support/test.py
index 5ad959a..011764b 100644 (file)
--- a/tests/system/suite_general/tst_basic_cpp_support/test.py
+++ b/tests/system/suite_general/tst_basic_cpp_support/test.py
@@ -1,4 +1,4 @@
-source(findFile("scripts", "qtcreator.py"))
+source("../../shared/qtcreator.py")
 
 refreshFinishedCount = 0
 

diff --git a/tests/system/suite_general/tst_build_speedcrunch/test.py b/tests/system/suite_general/tst_build_speedcrunch/test.py
index 241a208..b1a777b 100644 (file)
--- a/tests/system/suite_general/tst_build_speedcrunch/test.py
+++ b/tests/system/suite_general/tst_build_speedcrunch/test.py
@@ -1,4 +1,4 @@
-source(findFile("scripts", "qtcreator.py"))
+source("../../shared/qtcreator.py")
 
 SpeedCrunchPath = ""
 buildFinished = False

diff --git a/tests/system/suite_general/tst_cmake_speedcrunch/test.py b/tests/system/suite_general/tst_cmake_speedcrunch/test.py
index 70fcdaf..ebfebf8 100644 (file)
--- a/tests/system/suite_general/tst_cmake_speedcrunch/test.py
+++ b/tests/system/suite_general/tst_cmake_speedcrunch/test.py
@@ -1,4 +1,4 @@
-source(findFile("scripts", "qtcreator.py"))
+source("../../shared/qtcreator.py")
 
 SpeedCrunchPath = ""
 buildFinished = False

diff --git a/tests/system/suite_general/tst_openqt_creator/test.py b/tests/system/suite_general/tst_openqt_creator/test.py
index f16ae43..b78e005 100644 (file)
--- a/tests/system/suite_general/tst_openqt_creator/test.py
+++ b/tests/system/suite_general/tst_openqt_creator/test.py
@@ -1,4 +1,4 @@
-source(findFile("scripts", "qtcreator.py"))
+source("../../shared/qtcreator.py")
 
 refreshFinishedCount = 0