Tools/ChangeLog

2011-06-27  Adam Barth  <abarth@webkit.org>

        Reviewed by NOBODY (OOPS!).

        new-run-webkit-tests does not report stderr output

        https://bugs.webkit.org/show_bug.cgi?id=37739

        Almost all the infrastructure appears to be in place to report stderr

        in results.html.  We just need to wire up a bool to tell results.html

        to create the hyperlink.

        * Scripts/webkitpy/layout_tests/layout_package/manager.py:

        * Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py:

        * Scripts/webkitpy/layout_tests/layout_package/test_result_writer.py:

        * Scripts/webkitpy/layout_tests/layout_package/test_results.py:

        * Scripts/webkitpy/layout_tests/port/base.py:

2011-06-27  Eric Seidel  <eric@webkit.org>

        Reviewed by Adam Barth.

89809

Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py

@@def summarize_results(port_obj, expectat

            continue

        test_dict = {}

135 if False:

135 if result.has_stderr:

            test_dict['has_stderr'] = True

        if result_type == test_expectations.PASS:

89797

Tools/Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py

@@class SingleTestRunner:

        # FIXME: It the test crashed or timed out, it might be bettter to avoid

        # to write new baselines.

        self._save_baselines(driver_output)

143 return TestResult(self._filename, failures, driver_output.test_time)

143 return TestResult(self._filename, failures, driver_output.test_time, driver_output.has_stderr())

    def _save_baselines(self, driver_output):

        # Although all test_shell/DumpRenderTree output should be utf-8,

@@class SingleTestRunner:

        if driver_output.crash:

            # Don't continue any more if we already have a crash.

            # In case of timeouts, we continue since we still want to see the text and image output.

223 return TestResult(self._filename, failures, driver_output.test_time)

223 return TestResult(self._filename, failures, driver_output.test_time, driver_output.has_stderr())

        failures.extend(self._compare_text(driver_output.text, expected_driver_output.text))

        failures.extend(self._compare_audio(driver_output.audio, expected_driver_output.audio))

        if self._options.pixel_tests:

            failures.extend(self._compare_image(driver_output, expected_driver_output))

229 return TestResult(self._filename, failures, driver_output.test_time)

229 return TestResult(self._filename, failures, driver_output.test_time, driver_output.has_stderr())

    def _compare_text(self, actual_text, expected_text):

        failures = []

@@class SingleTestRunner:

    def _compare_output_with_reference(self, driver_output1, driver_output2):

        total_test_time = driver_output1.test_time + driver_output2.test_time

284 has_stderr = driver_output1.has_stderr() or driver_output2.has_stderr()

        failures = []

        failures.extend(self._handle_error(driver_output1))

        if failures:

            # Don't continue any more if we already have crash or timeout.

288 return TestResult(self._filename, failures, total_test_time)

289 return TestResult(self._filename, failures, total_test_time, has_stderr)

289290 failures.extend(self._handle_error(driver_output2, reference_filename=self._reference_filename))

290291 if failures:

291 return TestResult(self._filename, failures, total_test_time)

292 return TestResult(self._filename, failures, total_test_time, has_stderr)

        if self._is_mismatch_reftest:

            if driver_output1.image_hash == driver_output2.image_hash:

                failures.append(test_failures.FailureReftestMismatchDidNotOccur())

        elif driver_output1.image_hash != driver_output2.image_hash:

            failures.append(test_failures.FailureReftestMismatch())

298 return TestResult(self._filename, failures, total_test_time)

299 return TestResult(self._filename, failures, total_test_time, has_stderr)

89797

Tools/Scripts/webkitpy/layout_tests/layout_package/test_result_writer.py

@@class TestResultWriter(object):

    FILENAME_SUFFIX_ACTUAL = "-actual"

    FILENAME_SUFFIX_EXPECTED = "-expected"

    FILENAME_SUFFIX_DIFF = "-diff"

102 FILENAME_SUFFIX_STDERR = "-stderr"

    FILENAME_SUFFIX_WDIFF = "-wdiff.html"

    FILENAME_SUFFIX_PRETTY_PATCH = "-pretty-diff.html"

    FILENAME_SUFFIX_IMAGE_DIFF = "-diff.png"

@@class TestResultWriter(object):

    def write_stderr(self, error):

        fs = self._port._filesystem

164 filename = self.output_filename(~~"-stderr~~.txt")

165 filename = self.output_filename(self.FILENAME_SUFFIX_STDERR + ".txt")

        fs.maybe_make_directory(fs.dirname(filename))

        fs.write_binary_file(filename, error)

89797

Tools/Scripts/webkitpy/layout_tests/layout_package/test_results.py

@@class TestResult(object):

    def loads(str):

        return cPickle.loads(str)

41 def __init__(self, filename, failures=None, test_run_time=None):

41 def __init__(self, filename, failures=None, test_run_time=None, has_stderr=False):

        # FIXME: s/filename/name to be consistent with the rest of layout_package.

        self.filename = filename

        self.failures = failures or []

        self.test_run_time = test_run_time or 0

46 self.has_stderr = has_stderr

        # FIXME: Setting this in the constructor makes this class hard to mutate.

        self.type = test_failures.determine_result_type(failures)

89797

Tools/Scripts/webkitpy/layout_tests/port/base.py

@@class DriverOutput(object):

        self.timeout = timeout

        self.error = error

    def has_stderr(self):

        return bool(self.error)

class Driver:

    """Abstract interface for the DumpRenderTree interface."""

89798