Title: [92283] trunk/Tools
- Revision
- 92283
- Author
- [email protected]
- Date
- 2011-08-03 08:49:28 -0700 (Wed, 03 Aug 2011)
Log Message
[Qt] Fix running qmltests for WK2 in the bot
https://bugs.webkit.org/show_bug.cgi?id=65621
Reviewed by Csaba Osztrogonác.
The path for QML_IMPORT_PATH was assuming we were running the WK1 tests,
but now there's the case for WK2 UIProcess tests as well.
* Scripts/run-qtwebkit-tests: add both possible paths to the QML_IMPORT_PATH.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (92282 => 92283)
--- trunk/Tools/ChangeLog 2011-08-03 15:33:37 UTC (rev 92282)
+++ trunk/Tools/ChangeLog 2011-08-03 15:49:28 UTC (rev 92283)
@@ -1,3 +1,15 @@
+2011-08-03 Caio Marcelo de Oliveira Filho <[email protected]>
+
+ [Qt] Fix running qmltests for WK2 in the bot
+ https://bugs.webkit.org/show_bug.cgi?id=65621
+
+ Reviewed by Csaba Osztrogonác.
+
+ The path for QML_IMPORT_PATH was assuming we were running the WK1 tests,
+ but now there's the case for WK2 UIProcess tests as well.
+
+ * Scripts/run-qtwebkit-tests: add both possible paths to the QML_IMPORT_PATH.
+
2011-08-02 Dimitri Glazkov <[email protected]>
Add a way to edit test expectations.
Modified: trunk/Tools/Scripts/run-qtwebkit-tests (92282 => 92283)
--- trunk/Tools/Scripts/run-qtwebkit-tests 2011-08-03 15:33:37 UTC (rev 92282)
+++ trunk/Tools/Scripts/run-qtwebkit-tests 2011-08-03 15:49:28 UTC (rev 92283)
@@ -206,9 +206,12 @@
self._Pool = Pool
def run(self):
- """ We need to set this system variable in order to load the proper plugin for the qml tests """
- os.putenv("QML_IMPORT_PATH", self._options.path + "../../../imports")
""" Find && execute && publish results of all test. "All in one" function. """
+ # This is needed for Qt finding our QML modules. The current code makes our
+ # two existing API tests (WK1 API and WK2 UI process API) work correctly.
+ qml_import_path = self._options.path + "../../../imports"
+ qml_import_path += ":" + self._options.path + "../../../../../imports"
+ os.putenv("QML_IMPORT_PATH", qml_import_path)
self.debug("Searching executables...")
tests_executables = self.find_tests_paths(self._options.path)
self.debug("Found: %s", len(tests_executables))
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
