Title: [141441] trunk/Tools
- Revision
- 141441
- Author
- [email protected]
- Date
- 2013-01-31 10:50:06 -0800 (Thu, 31 Jan 2013)
Log Message
REGRESSION (r141402): incorrectly set injected bundle path when running GTK unit tests
https://bugs.webkit.org/show_bug.cgi?id=108496
Reviewed by Philippe Normand.
* Scripts/run-gtk-tests:
(TestRunner.__init__): Add the build type as a member on the TestRunner interface.
(TestRunner._setup_testing_environment): Use the build type member to determine correct path
to the injected bundle.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (141440 => 141441)
--- trunk/Tools/ChangeLog 2013-01-31 18:46:22 UTC (rev 141440)
+++ trunk/Tools/ChangeLog 2013-01-31 18:50:06 UTC (rev 141441)
@@ -1,3 +1,15 @@
+2013-01-31 Zan Dobersek <[email protected]>
+
+ REGRESSION (r141402): incorrectly set injected bundle path when running GTK unit tests
+ https://bugs.webkit.org/show_bug.cgi?id=108496
+
+ Reviewed by Philippe Normand.
+
+ * Scripts/run-gtk-tests:
+ (TestRunner.__init__): Add the build type as a member on the TestRunner interface.
+ (TestRunner._setup_testing_environment): Use the build type member to determine correct path
+ to the injected bundle.
+
2013-01-31 Christophe Dumez <[email protected]>
[EFL] Disable Web Intents
Modified: trunk/Tools/Scripts/run-gtk-tests (141440 => 141441)
--- trunk/Tools/Scripts/run-gtk-tests 2013-01-31 18:46:22 UTC (rev 141440)
+++ trunk/Tools/Scripts/run-gtk-tests 2013-01-31 18:50:06 UTC (rev 141441)
@@ -86,13 +86,9 @@
def __init__(self, options, tests=[]):
self._options = options
+ self._build_type = "Debug" if self._options.debug else "Release"
- if options.debug:
- build_type = 'Debug'
- else:
- build_type = 'Release'
-
- self._programs_path = common.build_path(build_type, "Programs")
+ self._programs_path = common.build_path(self._build_type, "Programs")
self._tests = self._get_tests(tests)
self._skipped_tests = TestRunner.SKIPPED
if not sys.stdout.isatty():
@@ -165,7 +161,7 @@
self._test_env["WEBKIT_INSPECTOR_PATH"] = os.path.abspath(os.path.join(self._programs_path, 'resources', 'inspector'))
self._test_env['GSETTINGS_BACKEND'] = 'memory'
self._test_env["TEST_WEBKIT_API_WEBKIT2_RESOURCES_PATH"] = common.top_level_path("Tools", "TestWebKitAPI", "Tests", "WebKit2")
- self._test_env["TEST_WEBKIT_API_WEBKIT2_INJECTED_BUNDLE_PATH"] = common.build_path("Libraries")
+ self._test_env["TEST_WEBKIT_API_WEBKIT2_INJECTED_BUNDLE_PATH"] = common.build_path(self._build_type, "Libraries")
self._test_env["WEBKIT_EXEC_PATH"] = self._programs_path
try:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
