Title: [101925] trunk/Tools
- Revision
- 101925
- Author
- [email protected]
- Date
- 2011-12-03 05:02:58 -0800 (Sat, 03 Dec 2011)
Log Message
GTK API tests build fix. Run the tests inside jhbuild.
Rubber-stamped by Gustavo Noronha Silva.
* Scripts/run-gtk-tests:
(TestRunner.__init__):
(TestRunner.run._error_handler):
(TestRunner):
(TestRunner.run):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (101924 => 101925)
--- trunk/Tools/ChangeLog 2011-12-03 12:20:26 UTC (rev 101924)
+++ trunk/Tools/ChangeLog 2011-12-03 13:02:58 UTC (rev 101925)
@@ -1,3 +1,15 @@
+2011-12-03 Philippe Normand <[email protected]>
+
+ GTK API tests build fix. Run the tests inside jhbuild.
+
+ Rubber-stamped by Gustavo Noronha Silva.
+
+ * Scripts/run-gtk-tests:
+ (TestRunner.__init__):
+ (TestRunner.run._error_handler):
+ (TestRunner):
+ (TestRunner.run):
+
2011-12-03 Martin Robinson <[email protected]>
Small build fix. Properly specify the path to the locally installed jhbuild.
Modified: trunk/Tools/Scripts/run-gtk-tests (101924 => 101925)
--- trunk/Tools/Scripts/run-gtk-tests 2011-12-03 12:20:26 UTC (rev 101924)
+++ trunk/Tools/Scripts/run-gtk-tests 2011-12-03 13:02:58 UTC (rev 101925)
@@ -43,10 +43,14 @@
if not is_valid_build_directory(build_directory):
build_directory = os.path.join(top_level, 'WebKitBuild', 'Debug')
+ self._gtk_tools_directory = os.path.join(top_level, "Tools", "gtk")
self._programs_path = os.path.join(build_directory, "Programs")
self._tests = []
for test_dir in self.TEST_DIRS:
- for test_file in os.listdir(os.path.join(self._programs_path, test_dir)):
+ absolute_test_dir = os.path.join(self._programs_path, test_dir)
+ if not os.path.isdir(absolute_test_dir):
+ continue
+ for test_file in os.listdir(absolute_test_dir):
test_relative_path = os.path.join(test_dir, test_file)
if test_relative_path in self.SKIPPED:
sys.stdout.write("Skipping test %s\n" % (test_relative_path))
@@ -70,8 +74,9 @@
def _error_handler(error):
exit_status[0] = error.exit_code
+ jhbuild_path = os.path.join(self._gtk_tools_directory, "run-with-jhbuild")
for test in self._tests:
- out = self._executive.run_command(['gtester', test], env=test_env,
+ out = self._executive.run_command([jhbuild_path ,'gtester', test], env=test_env,
error_handler=_error_handler)
sys.stdout.write(out)
sys.stdout.flush()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
