Title: [226970] trunk/Tools
- Revision
- 226970
- Author
- [email protected]
- Date
- 2018-01-16 06:18:40 -0800 (Tue, 16 Jan 2018)
Log Message
Unreviewed. Fix GTK unit tests execution in the bots after r226967.
I forgot to pass the environment to the GLibTestRunner and Xvfb was not used in the bots.
* glib/api_test_runner.py:
(TestRunner._run_test_glib): Pass env to GLibTestRunner.
* glib/glib_test_runner.py:
(GLibTestRunner.run): Use given env.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (226969 => 226970)
--- trunk/Tools/ChangeLog 2018-01-16 12:10:37 UTC (rev 226969)
+++ trunk/Tools/ChangeLog 2018-01-16 14:18:40 UTC (rev 226970)
@@ -1,5 +1,16 @@
2018-01-16 Carlos Garcia Campos <[email protected]>
+ Unreviewed. Fix GTK unit tests execution in the bots after r226967.
+
+ I forgot to pass the environment to the GLibTestRunner and Xvfb was not used in the bots.
+
+ * glib/api_test_runner.py:
+ (TestRunner._run_test_glib): Pass env to GLibTestRunner.
+ * glib/glib_test_runner.py:
+ (GLibTestRunner.run): Use given env.
+
+2018-01-16 Carlos Garcia Campos <[email protected]>
+
[GTK][WPE] Stop passing --verbose to run-api-tests from the bots
https://bugs.webkit.org/show_bug.cgi?id=181676
Modified: trunk/Tools/glib/api_test_runner.py (226969 => 226970)
--- trunk/Tools/glib/api_test_runner.py 2018-01-16 12:10:37 UTC (rev 226969)
+++ trunk/Tools/glib/api_test_runner.py 2018-01-16 14:18:40 UTC (rev 226970)
@@ -150,7 +150,7 @@
test = os.path.join(os.path.basename(os.path.dirname(test_program)), os.path.basename(test_program))
if self._expectations.is_slow(os.path.basename(test_program)):
timeout *= 5
- return GLibTestRunner(test_program, timeout).run(skipped=self._test_cases_to_skip(test_program))
+ return GLibTestRunner(test_program, timeout).run(skipped=self._test_cases_to_skip(test_program), env=self._test_env)
def _get_tests_from_google_test_suite(self, test_program):
try:
Modified: trunk/Tools/glib/glib_test_runner.py (226969 => 226970)
--- trunk/Tools/glib/glib_test_runner.py 2018-01-16 12:10:37 UTC (rev 226969)
+++ trunk/Tools/glib/glib_test_runner.py 2018-01-16 14:18:40 UTC (rev 226970)
@@ -230,7 +230,7 @@
self._subtest = None
self._subtest_messages = []
- def run(self, subtests=[], skipped=[]):
+ def run(self, subtests=[], skipped=[], env=None):
pipe_r, pipe_w = os.pipe()
command = [self._test_binary, '--quiet', '--keep-going', '--GTestLogFD=%d' % pipe_w]
if self._results:
@@ -243,7 +243,7 @@
if not self._results:
sys.stdout.write('TEST: %s...\n' % self._test_binary)
sys.stdout.flush()
- p = subprocess.Popen(command, stderr=subprocess.PIPE)
+ p = subprocess.Popen(command, stderr=subprocess.PIPE, env=env)
self._stderr_fd = p.stderr.fileno()
os.close(pipe_w)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
