From db877ecf4fe8ef157c827ef15ddd06bef7ef0283 Mon Sep 17 00:00:00 2001 From: Ojan Vafai Date: Mon, 8 Dec 2014 11:15:13 -0800 Subject: [PATCH] Green sky tests on the asan bot. Skipped tests were not getting skipped because the code gets whether the build is a debug or release build from the configuration commandline argument, but the asan bots pass Release_asan. Instead, read the debug vs. release state from gn args instead of inferring it from the out directory. R=eseidel@chromium.org, esprehn@chromium.org, sky@chromium.org Review URL: https://codereview.chromium.org/754673003 --- tools/webkitpy/layout_tests/port/base.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/webkitpy/layout_tests/port/base.py b/tools/webkitpy/layout_tests/port/base.py index 18f0303050f..9227ac66ad8 100644 --- a/tools/webkitpy/layout_tests/port/base.py +++ b/tools/webkitpy/layout_tests/port/base.py @@ -1159,7 +1159,17 @@ class Port(object): def test_configuration(self): """Returns the current TestConfiguration for the port.""" if not self._test_configuration: - self._test_configuration = TestConfiguration(self._version, self._architecture, self._options.configuration.lower()) + gn_args = self._executive.run_command([ + 'gn', 'args', + self._build_path_with_configuration(self._options.configuration), + '--list', '--short']) + + if 'is_debug = true' in gn_args: + configuration = 'debug' + else: + configuration = 'release' + + self._test_configuration = TestConfiguration(self._version, self._architecture, configuration) return self._test_configuration # FIXME: Belongs on a Platform object.