Changeset 85692 in webkit


Ignore:
Timestamp:
May 3, 2011 5:23:24 PM (13 years ago)
Author:
mihaip@chromium.org
Message:

2011-05-03 Mihai Parparita <mihaip@chromium.org>

Reviewed by Ojan Vafai.

Update rebaseline queue server to handle hierarchical test results
https://bugs.webkit.org/show_bug.cgi?id=60063

Update test result parsing done by the rebaseline queue server to handle
the hierarchical test result output that is generated as of r85254.

  • RebaselineQueueServer/templates/builder-queue-edit.html:
Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r85672 r85692  
     12011-05-03  Mihai Parparita  <mihaip@chromium.org>
     2
     3        Reviewed by Ojan Vafai.
     4
     5        Update rebaseline queue server to handle hierarchical test results
     6        https://bugs.webkit.org/show_bug.cgi?id=60063
     7       
     8        Update test result parsing done by the rebaseline queue server to handle
     9        the hierarchical test result output that is generated as of r85254.
     10
     11        * RebaselineQueueServer/templates/builder-queue-edit.html:
     12
    1132011-05-03  Eric Seidel  <eric@webkit.org>
    214
  • trunk/Tools/RebaselineQueueServer/templates/builder-queue-edit.html

    r83781 r85692  
    4545function init()
    4646{
    47   var builderMaster = BUILDER_TO_MASTER[builderName];
     47  var builderMaster = BUILDER_TO_MASTER[builderName] || CHROMIUM_GPU_BUILDER_MASTER;
    4848  var resultsUrl = TEST_RESULTS_SERVER + 'testfile?builder=' + builderName +
    4949      '&master=' + builderMaster.name +
     
    5959    var builderGroupName = BUILDER_TO_GROUP[builderName];
    6060
    61     var tests = results.tests;
    6261    var failingTests = [];
    6362    var queuedTests = [];
    64     for (var test in tests) {
    65         var testResults = tests[test];
    66         if (testResults.actual == testResults.expected ||
    67             testResults.expected.split(' ').indexOf(testResults.actual) != -1 ||
    68             testResults.actual == 'SKIP' ||
    69             testResults.actual.indexOf('PASS') != -1 ||
    70             (testResults.actual != 'PASS' && testResults.expected.indexOf('FAIL') != -1)) {
     63    function processTestResult(test, results) {
     64        var actual = results.actual;
     65        var expected = results.expected;
     66        if (actual == expected ||
     67            expected.split(' ').indexOf(actual) != -1 ||
     68            actual == 'SKIP' ||
     69            actual.indexOf('PASS') != -1 ||
     70            (expected.indexOf('FAIL') != -1 && actual.indexOf('TIMEOUT') == -1)) {
    7171            continue;
    7272        }
    7373
    74         testResults.name = test;
     74        results.name = test;
    7575
    7676        if (queuedTestNames.indexOf(test) != -1) {
    77             queuedTests.push(testResults);
     77            queuedTests.push(results);
    7878            queuedTestNames.splice(queuedTestNames.indexOf(test), 1);
    7979        } else {
    80             failingTests.push(testResults);
     80            failingTests.push(results);
    8181        }
    8282    }
     83
     84    function gatherTests(path, testTree) {
     85        if ('actual' in testTree) {
     86            processTestResult(path, testTree);
     87        } else {
     88            if (path) {
     89              path += '/';
     90            }
     91            for (var key in testTree) {
     92                gatherTests(path + key, testTree[key]);
     93            }
     94        }
     95    }
     96    gatherTests('', results.tests);
    8397
    8498    // If we have remaining queued tests that are currently not failing,
Note: See TracChangeset for help on using the changeset viewer.