Remove "../tests/" from the URLs of all tests
authorjonlee@apple.com <jonlee@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 12 Oct 2015 23:25:41 +0000 (23:25 +0000)
committerjonlee@apple.com <jonlee@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 12 Oct 2015 23:25:41 +0000 (23:25 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@190903 268f45cc-cd09-0410-ab3c-d52691b4dbfc

PerformanceTests/Animometer/runner/resources/benchmark-runner.js
PerformanceTests/Animometer/runner/resources/tests.js
PerformanceTests/ChangeLog

index 499033d..1273964 100644 (file)
@@ -46,7 +46,7 @@ BenchmarkRunnerState.prototype.prepareCurrentTest = function(runner, frame)
     frame.onload = function() {
         suite.prepare(runner, frame.contentWindow, frame.contentDocument).then(function(result) { promise.resolve(result); });
     }
-    frame.src = test.url;
+    frame.src = "../tests/" + test.url;
     return promise;
 }
 
index d722af8..5b4f02c 100644 (file)
@@ -60,27 +60,27 @@ var Suites = [];
 Suites.push(new Suite("HTML suite",
     [
         { 
-            url: "../tests/bouncing-particles/bouncing-css-shapes.html?gain=1&addLimit=100&removeLimit=5&particleWidth=12&particleHeight=12&shape=circle",
+            url: "bouncing-particles/bouncing-css-shapes.html?gain=1&addLimit=100&removeLimit=5&particleWidth=12&particleHeight=12&shape=circle",
             name: "CSS bouncing circles"
         },
         { 
-            url: "../tests/bouncing-particles/bouncing-css-shapes.html?gain=1&addLimit=100&removeLimit=5&particleWidth=40&particleHeight=40&shape=rect&clip=star",
+            url: "bouncing-particles/bouncing-css-shapes.html?gain=1&addLimit=100&removeLimit=5&particleWidth=40&particleHeight=40&shape=rect&clip=star",
             name: "CSS bouncing clipped rects"
         },
         { 
-            url: "../tests/bouncing-particles/bouncing-css-shapes.html?gain=1&addLimit=100&removeLimit=5&particleWidth=50&particleHeight=50&shape=circle&fill=gradient",
+            url: "bouncing-particles/bouncing-css-shapes.html?gain=1&addLimit=100&removeLimit=5&particleWidth=50&particleHeight=50&shape=circle&fill=gradient",
             name: "CSS bouncing gradient circles"
         },
         {
-            url: "../tests/bouncing-particles/bouncing-css-images.html?gain=0.4&addLimit=5&removeLimit=2&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.svg",
+            url: "bouncing-particles/bouncing-css-images.html?gain=0.4&addLimit=5&removeLimit=2&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.svg",
             name: "CSS bouncing SVG images"
         },
         {
-            url: "../tests/bouncing-particles/bouncing-css-images.html?gain=1&addLimit=100&removeLimit=5&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.png",
+            url: "bouncing-particles/bouncing-css-images.html?gain=1&addLimit=100&removeLimit=5&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.png",
             name: "CSS bouncing PNG images"
         },
         {
-            url: "../tests/text/layering-text.html?gain=4&addLimit=100&removeLimit=100",
+            url: "text/layering-text.html?gain=4&addLimit=100&removeLimit=100",
             name: "CSS layering text"
         },
     ]
@@ -89,23 +89,23 @@ Suites.push(new Suite("HTML suite",
 Suites.push(new Suite("Canvas suite",
     [
         { 
-            url: "../tests/bouncing-particles/bouncing-canvas-shapes.html?gain=4&addLimit=100&removeLimit=1000&particleWidth=12&particleHeight=12&shape=circle",
+            url: "bouncing-particles/bouncing-canvas-shapes.html?gain=4&addLimit=100&removeLimit=1000&particleWidth=12&particleHeight=12&shape=circle",
             name: "canvas bouncing circles"
         },
         { 
-            url: "../tests/bouncing-particles/bouncing-canvas-shapes.html?gain=4&addLimit=100&removeLimit=1000&particleWidth=40&particleHeight=40&shape=rect&clip=star",
+            url: "bouncing-particles/bouncing-canvas-shapes.html?gain=4&addLimit=100&removeLimit=1000&particleWidth=40&particleHeight=40&shape=rect&clip=star",
             name: "canvas bouncing clipped rects"
         },
         { 
-            url: "../tests/bouncing-particles/bouncing-canvas-shapes.html?gain=4&addLimit=100&removeLimit=1000&particleWidth=50&particleHeight=50&shape=circle&fill=gradient",
+            url: "bouncing-particles/bouncing-canvas-shapes.html?gain=4&addLimit=100&removeLimit=1000&particleWidth=50&particleHeight=50&shape=circle&fill=gradient",
             name: "canvas bouncing gradient circles"
         },
         { 
-            url: "../tests/bouncing-particles/bouncing-canvas-images.html?gain=0.4&addLimit=5&removeLimit=1&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.svg",
+            url: "bouncing-particles/bouncing-canvas-images.html?gain=0.4&addLimit=5&removeLimit=1&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.svg",
             name: "canvas bouncing SVG images"
         },
         {
-            url: "../tests/bouncing-particles/bouncing-canvas-images.html?gain=4&addLimit=1000&removeLimit=1000&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.png",
+            url: "bouncing-particles/bouncing-canvas-images.html?gain=4&addLimit=1000&removeLimit=1000&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.png",
             name: "canvas bouncing PNG images"
         },
     ]
@@ -114,23 +114,23 @@ Suites.push(new Suite("Canvas suite",
 Suites.push(new Suite("SVG suite",
     [
         {
-            url: "../tests/bouncing-particles/bouncing-svg-shapes.html?gain=6&addLimit=100&removeLimit=1000&particleWidth=12&particleHeight=12&shape=circle",
+            url: "bouncing-particles/bouncing-svg-shapes.html?gain=6&addLimit=100&removeLimit=1000&particleWidth=12&particleHeight=12&shape=circle",
             name: "SVG bouncing circles",
         },
         {
-            url: "../tests/bouncing-particles/bouncing-svg-shapes.html?gain=0.6&addLimit=10&removeLimit=1&particleWidth=40&particleHeight=40&shape=rect&clip=star",
+            url: "bouncing-particles/bouncing-svg-shapes.html?gain=0.6&addLimit=10&removeLimit=1&particleWidth=40&particleHeight=40&shape=rect&clip=star",
             name: "SVG bouncing clipped rects",
         },
         {
-            url: "../tests/bouncing-particles/bouncing-svg-shapes.html?gain=0.8&addLimit=10&removeLimit=4&particleWidth=50&particleHeight=50&shape=circle&fill=gradient",
+            url: "bouncing-particles/bouncing-svg-shapes.html?gain=0.8&addLimit=10&removeLimit=4&particleWidth=50&particleHeight=50&shape=circle&fill=gradient",
             name: "SVG bouncing gradient circles"
         },
         {
-            url: "../tests/bouncing-particles/bouncing-svg-images.html?gain=0.4&addLimit=5&removeLimit=2&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.svg",
+            url: "bouncing-particles/bouncing-svg-images.html?gain=0.4&addLimit=5&removeLimit=2&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.svg",
             name: "SVG bouncing SVG images"
         },
         {
-            url: "../tests/bouncing-particles/bouncing-svg-images.html?gain=4&addLimit=100&removeLimit=5&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.png",
+            url: "bouncing-particles/bouncing-svg-images.html?gain=4&addLimit=100&removeLimit=5&particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.png",
             name: "SVG bouncing PNG images"
         },
     ]
@@ -139,11 +139,11 @@ Suites.push(new Suite("SVG suite",
 Suites.push(new Suite("Complex examples",
     [
         {
-            url: "../tests/examples/canvas-electrons.html?gain=1&addLimit=100&removeLimit=10",
+            url: "examples/canvas-electrons.html?gain=1&addLimit=100&removeLimit=10",
             name: "canvas electrons"
         },
         {
-            url: "../tests/examples/canvas-stars.html?gain=4&addLimit=100&removeLimit=5",
+            url: "examples/canvas-stars.html?gain=4&addLimit=100&removeLimit=5",
             name: "canvas stars"
         },
     ]
@@ -152,15 +152,15 @@ Suites.push(new Suite("Complex examples",
 Suites.push(new Suite("Test Templates",
     [
         {
-            url: "../tests/template/template-css.html?gain=1&addLimit=100&removeLimit=5",
+            url: "template/template-css.html?gain=1&addLimit=100&removeLimit=5",
             name: "CSS template"
         },
         {
-            url: "../tests/template/template-canvas.html?gain=1&addLimit=100&removeLimit=1000",
+            url: "template/template-canvas.html?gain=1&addLimit=100&removeLimit=1000",
             name: "canvas template"
         },
         {
-            url: "../tests/template/template-svg.html?gain=1&addLimit=100&removeLimit=5&<other_paramter>=<value>",
+            url: "template/template-svg.html?gain=1&addLimit=100&removeLimit=5&<other_paramter>=<value>",
             name: "SVG template"
         },
     ]
index c9fe6c6..2da8b13 100644 (file)
@@ -1,5 +1,22 @@
 2015-10-12  Jon Lee  <jonlee@apple.com>
 
+        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.
+
+2015-10-12  Jon Lee  <jonlee@apple.com>
+
         Refactor test suites to a separate class.
         https://bugs.webkit.org/show_bug.cgi?id=150053
         <rdar://problem/23078645>