Changeset 190903 in webkit


Ignore:
Timestamp:
Oct 12, 2015 4:25:41 PM (9 years ago)
Author:
jonlee@apple.com
Message:

Remove "../tests/" from the URLs of all tests
​https://bugs.webkit.org/show_bug.cgi?id=150054
<rdar://problem/23078784>

Reviewed by Dean Jackson.

Presumably all tests will be running from the tests/ directory,
so we don't have to specify it in all of the test URLs.

  • Animometer/runner/resources/benchmark-runner.js:

(BenchmarkRunnerState.prototype.prepareCurrentTest): Prepend
"../tests/" to all tests.

  • Animometer/runner/resources/tests.js: Remove "../tests/" from

all URLs.

Location:
trunk/PerformanceTests
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/PerformanceTests/Animometer/runner/resources/benchmark-runner.js

    r190526 r190903  
    4747        suite.prepare(runner, frame.contentWindow, frame.contentDocument).then(function(result) { promise.resolve(result); });
    4848    }
    49     frame.src = test.url;
     49    frame.src = "../tests/" + test.url;
    5050    return promise;
    5151}

  • trunk/PerformanceTests/Animometer/runner/resources/tests.js

    r190902 r190903  
    6161    [
    6262        {
    63             url: "../tests/bouncing-particles/bouncing-css-shapes.html?gain=1&addLimit=100&removeLimit=5&particleWidth=12&particleHeight=12&shape=circle",
     63            url: "bouncing-particles/bouncing-css-shapes.html?gain=1&addLimit=100&removeLimit=5&particleWidth=12&particleHeight=12&shape=circle",
    6464            name: "CSS bouncing circles"
    6565        },
    6666        {
    67             url: "../tests/bouncing-particles/bouncing-css-shapes.html?gain=1&addLimit=100&removeLimit=5&particleWidth=40&particleHeight=40&shape=rect&clip=star",
     67            url: "bouncing-particles/bouncing-css-shapes.html?gain=1&addLimit=100&removeLimit=5&particleWidth=40&particleHeight=40&shape=rect&clip=star",
    6868            name: "CSS bouncing clipped rects"
    6969        },
    7070        {
    71             url: "../tests/bouncing-particles/bouncing-css-shapes.html?gain=1&addLimit=100&removeLimit=5&particleWidth=50&particleHeight=50&shape=circle&fill=gradient",
     71            url: "bouncing-particles/bouncing-css-shapes.html?gain=1&addLimit=100&removeLimit=5&particleWidth=50&particleHeight=50&shape=circle&fill=gradient",
    7272            name: "CSS bouncing gradient circles"
    7373        },
    7474        {
    75             url: "../tests/bouncing-particles/bouncing-css-images.html?gain=0.4&addLimit=5&removeLimit=2&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.svg",
     75            url: "bouncing-particles/bouncing-css-images.html?gain=0.4&addLimit=5&removeLimit=2&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.svg",
    7676            name: "CSS bouncing SVG images"
    7777        },
    7878        {
    79             url: "../tests/bouncing-particles/bouncing-css-images.html?gain=1&addLimit=100&removeLimit=5&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.png",
     79            url: "bouncing-particles/bouncing-css-images.html?gain=1&addLimit=100&removeLimit=5&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.png",
    8080            name: "CSS bouncing PNG images"
    8181        },
    8282        {
    83             url: "../tests/text/layering-text.html?gain=4&addLimit=100&removeLimit=100",
     83            url: "text/layering-text.html?gain=4&addLimit=100&removeLimit=100",
    8484            name: "CSS layering text"
    8585        },
    … …  
    9090    [
    9191        {
    92             url: "../tests/bouncing-particles/bouncing-canvas-shapes.html?gain=4&addLimit=100&removeLimit=1000&particleWidth=12&particleHeight=12&shape=circle",
     92            url: "bouncing-particles/bouncing-canvas-shapes.html?gain=4&addLimit=100&removeLimit=1000&particleWidth=12&particleHeight=12&shape=circle",
    9393            name: "canvas bouncing circles"
    9494        },
    9595        {
    96             url: "../tests/bouncing-particles/bouncing-canvas-shapes.html?gain=4&addLimit=100&removeLimit=1000&particleWidth=40&particleHeight=40&shape=rect&clip=star",
     96            url: "bouncing-particles/bouncing-canvas-shapes.html?gain=4&addLimit=100&removeLimit=1000&particleWidth=40&particleHeight=40&shape=rect&clip=star",
    9797            name: "canvas bouncing clipped rects"
    9898        },
    9999        {
    100             url: "../tests/bouncing-particles/bouncing-canvas-shapes.html?gain=4&addLimit=100&removeLimit=1000&particleWidth=50&particleHeight=50&shape=circle&fill=gradient",
     100            url: "bouncing-particles/bouncing-canvas-shapes.html?gain=4&addLimit=100&removeLimit=1000&particleWidth=50&particleHeight=50&shape=circle&fill=gradient",
    101101            name: "canvas bouncing gradient circles"
    102102        },
    103103        {
    104             url: "../tests/bouncing-particles/bouncing-canvas-images.html?gain=0.4&addLimit=5&removeLimit=1&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.svg",
     104            url: "bouncing-particles/bouncing-canvas-images.html?gain=0.4&addLimit=5&removeLimit=1&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.svg",
    105105            name: "canvas bouncing SVG images"
    106106        },
    107107        {
    108             url: "../tests/bouncing-particles/bouncing-canvas-images.html?gain=4&addLimit=1000&removeLimit=1000&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.png",
     108            url: "bouncing-particles/bouncing-canvas-images.html?gain=4&addLimit=1000&removeLimit=1000&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.png",
    109109            name: "canvas bouncing PNG images"
    110110        },
    … …  
    115115    [
    116116        {
    117             url: "../tests/bouncing-particles/bouncing-svg-shapes.html?gain=6&addLimit=100&removeLimit=1000&particleWidth=12&particleHeight=12&shape=circle",
     117            url: "bouncing-particles/bouncing-svg-shapes.html?gain=6&addLimit=100&removeLimit=1000&particleWidth=12&particleHeight=12&shape=circle",
    118118            name: "SVG bouncing circles",
    119119        },
    120120        {
    121             url: "../tests/bouncing-particles/bouncing-svg-shapes.html?gain=0.6&addLimit=10&removeLimit=1&particleWidth=40&particleHeight=40&shape=rect&clip=star",
     121            url: "bouncing-particles/bouncing-svg-shapes.html?gain=0.6&addLimit=10&removeLimit=1&particleWidth=40&particleHeight=40&shape=rect&clip=star",
    122122            name: "SVG bouncing clipped rects",
    123123        },
    124124        {
    125             url: "../tests/bouncing-particles/bouncing-svg-shapes.html?gain=0.8&addLimit=10&removeLimit=4&particleWidth=50&particleHeight=50&shape=circle&fill=gradient",
     125            url: "bouncing-particles/bouncing-svg-shapes.html?gain=0.8&addLimit=10&removeLimit=4&particleWidth=50&particleHeight=50&shape=circle&fill=gradient",
    126126            name: "SVG bouncing gradient circles"
    127127        },
    128128        {
    129             url: "../tests/bouncing-particles/bouncing-svg-images.html?gain=0.4&addLimit=5&removeLimit=2&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.svg",
     129            url: "bouncing-particles/bouncing-svg-images.html?gain=0.4&addLimit=5&removeLimit=2&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.svg",
    130130            name: "SVG bouncing SVG images"
    131131        },
    132132        {
    133             url: "../tests/bouncing-particles/bouncing-svg-images.html?gain=4&addLimit=100&removeLimit=5&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.png",
     133            url: "bouncing-particles/bouncing-svg-images.html?gain=4&addLimit=100&removeLimit=5&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.png",
    134134            name: "SVG bouncing PNG images"
    135135        },
    … …  
    140140    [
    141141        {
    142             url: "../tests/examples/canvas-electrons.html?gain=1&addLimit=100&removeLimit=10",
     142            url: "examples/canvas-electrons.html?gain=1&addLimit=100&removeLimit=10",
    143143            name: "canvas electrons"
    144144        },
    145145        {
    146             url: "../tests/examples/canvas-stars.html?gain=4&addLimit=100&removeLimit=5",
     146            url: "examples/canvas-stars.html?gain=4&addLimit=100&removeLimit=5",
    147147            name: "canvas stars"
    148148        },
    … …  
    153153    [
    154154        {
    155             url: "../tests/template/template-css.html?gain=1&addLimit=100&removeLimit=5",
     155            url: "template/template-css.html?gain=1&addLimit=100&removeLimit=5",
    156156            name: "CSS template"
    157157        },
    158158        {
    159             url: "../tests/template/template-canvas.html?gain=1&addLimit=100&removeLimit=1000",
     159            url: "template/template-canvas.html?gain=1&addLimit=100&removeLimit=1000",
    160160            name: "canvas template"
    161161        },
    162162        {
    163             url: "../tests/template/template-svg.html?gain=1&addLimit=100&removeLimit=5&<other_paramter>=<value>",
     163            url: "template/template-svg.html?gain=1&addLimit=100&removeLimit=5&<other_paramter>=<value>",
    164164            name: "SVG template"
    165165        },

  • trunk/PerformanceTests/ChangeLog

    r190902 r190903  
     12015-10-12  Jon Lee  <jonlee@apple.com>
     2
     3        Remove "../tests/" from the URLs of all tests
     4        https://bugs.webkit.org/show_bug.cgi?id=150054
     5        <rdar://problem/23078784>
     6
     7        Reviewed by Dean Jackson.
     8
     9        Presumably all tests will be running from the tests/ directory,
     10        so we don't have to specify it in all of the test URLs.
     11
     12        * Animometer/runner/resources/benchmark-runner.js:
     13        (BenchmarkRunnerState.prototype.prepareCurrentTest): Prepend
     14        "../tests/" to all tests.
     15        * Animometer/runner/resources/tests.js: Remove "../tests/" from
     16        all URLs.
     17
    1182015-10-12  Jon Lee  <jonlee@apple.com>
    219
Note: See TracChangeset for help on using the changeset viewer.