Bug 1381845 - Prevent support file being interpreted as test, r=annevk
authorJames Graham <james@hoppipolla.co.uk>
Wed, 22 Mar 2017 12:07:52 +0000
changeset 418669 c823c6fdfd9e8c9c3adf778f36a8cf5b50d68750
parent 418668 1e739583d8f8283b5d6e95d6dfb8facfe5dec0b5
child 418670 f76dbba3cf2278620cc52c7b4a71f6cda06872c4
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersannevk
bugs1381845
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1381845 - Prevent support file being interpreted as test, r=annevk MozReview-Commit-ID: FFVMAQlXQZl
testing/web-platform/tests/css/css-values-3/support/vh_not_refreshing_on_chrome_iframe.html
testing/web-platform/tests/css/css-values-3/vh_not_refreshing_on_chrome.html
testing/web-platform/tests/css/css-values-3/vh_not_refreshing_on_chrome_iframe.html
testing/web-platform/tests/lint.whitelist
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/css-values-3/support/vh_not_refreshing_on_chrome_iframe.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html>
+<!-- Submitted from TestTWF Paris -->
+<head>
+
+	<title>CSS Values and Units Test: vh-based dimension doesn't change when the element other dimension doesn't change.</title>
+
+	<style type="text/css">
+
+		* { margin: 0; padding: 0; font-family: Arial, Helvetica, sans-serif; font-size: 13px; }
+
+			/* the first test box has its vertical dimension is set to some vh units */
+		#testBoxWithVhOnly { background: #F00; width: 60px; height: 20vh; float: left; }
+
+			/* the second test box, with fixed height */
+		#testBoxNotGrownHorizontallyByJS { background: #F0F; width: 20vh; height: 60px; float: left; }
+
+			/* third box, changed by using CSS transition */
+		#testBoxWithTransition { background: #FF0; width: 20vh; height: 40px; float: left;
+			transition-property:       width, height;
+			transition-duration:       1.5s;
+			transition-delay:          0;
+		}
+
+			/* the reference box, growing in both directions (height by js, width by vh unit */
+		#referenceBoxGrownHorizontallyByJS { background: #0F0; width: 20vh; height: 40px; float: left; }
+
+		p { clear: both; margin: 10px 0; }
+
+	</style>
+
+</head>
+<body>
+
+<p>
+	All boxes should end up the same size. The green box is the reference one.
+</p>
+
+<div id="testBoxWithVhOnly"></div>
+<div id="testBoxNotGrownHorizontallyByJS"></div>
+<div id="testBoxWithTransition"></div>
+<div id="referenceBoxGrownHorizontallyByJS"></div>
+
+<script type="text/javascript">
+
+	// In case this file was opened by mistake, redirects to proper test
+	if (window.top.location.href  === document.location.href) {
+
+		window.top.location.href = "vh_not_refreshing_on_chrome.html";
+
+	}
+
+	function setDimension(id, dimension, value) {
+
+		var element = document.getElementById(id);
+
+		element.style[dimension] = value + "px";
+
+	}
+
+	function animate() {
+
+		var viewportHeight = document.documentElement.clientHeight;
+
+		var sizeH = 20;
+
+		var referenceDimension = Math.round(sizeH * viewportHeight / 100);
+
+		setDimension('referenceBoxGrownHorizontallyByJS', 'height', referenceDimension);
+
+		setTimeout(animate, 20);
+	}
+
+	setTimeout(animate, 20);
+
+	var transitionedTestBoxStyle = document.getElementById('testBoxWithTransition').style;
+	transitionedTestBoxStyle.height = "60px";
+</script>
+
+</body>
+</html>
--- a/testing/web-platform/tests/css/css-values-3/vh_not_refreshing_on_chrome.html
+++ b/testing/web-platform/tests/css/css-values-3/vh_not_refreshing_on_chrome.html
@@ -42,12 +42,12 @@
 		}
 
 		setTimeout(resizeReference, 10);
 	</script>
 
 </head>
 <body>
 
-<iframe id="frameTest" src="vh_not_refreshing_on_chrome_iframe.html" frameborder="0"></iframe>
+<iframe id="frameTest" src="support/vh_not_refreshing_on_chrome_iframe.html" frameborder="0"></iframe>
 
 </body>
 </html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-values-3/vh_not_refreshing_on_chrome_iframe.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- Submitted from TestTWF Paris -->
-<head>
-
-	<title>CSS Values and Units Test: vh-based dimension doesn't change when the element other dimension doesn't change.</title>
-	<meta name="assert" content="vh-based dimension doesn't change when the element other dimension doesn't change. Bug for Chrome 19.0.1084.56 / Mac OS X 10.6.8">
-	<link rel="author" title="Marc Bourlon" href="mailto:marc@bourlon.com">
-	<link rel="help" href="http://www.w3.org/TR/css3-values/#viewport-relative-lengths" title="5.1.2. Viewport-percentage lengths: the 'vw', 'vh', 'vmin', 'vmax' units">
-	<link rel="match" href="reference/vh_not_refreshing_on_chrome-ref.html">
-
-	<style type="text/css">
-
-		* { margin: 0; padding: 0; font-family: Arial, Helvetica, sans-serif; font-size: 13px; }
-
-			/* the first test box has its vertical dimension is set to some vh units */
-		#testBoxWithVhOnly { background: #F00; width: 60px; height: 20vh; float: left; }
-
-			/* the second test box, with fixed height */
-		#testBoxNotGrownHorizontallyByJS { background: #F0F; width: 20vh; height: 60px; float: left; }
-
-			/* third box, changed by using CSS transition */
-		#testBoxWithTransition { background: #FF0; width: 20vh; height: 40px; float: left;
-			transition-property:       width, height;
-			transition-duration:       1.5s;
-			transition-delay:          0;
-		}
-
-			/* the reference box, growing in both directions (height by js, width by vh unit */
-		#referenceBoxGrownHorizontallyByJS { background: #0F0; width: 20vh; height: 40px; float: left; }
-
-		p { clear: both; margin: 10px 0; }
-
-	</style>
-
-</head>
-<body>
-
-<p>
-	All boxes should end up the same size. The green box is the reference one.
-</p>
-
-<div id="testBoxWithVhOnly"></div>
-<div id="testBoxNotGrownHorizontallyByJS"></div>
-<div id="testBoxWithTransition"></div>
-<div id="referenceBoxGrownHorizontallyByJS"></div>
-
-<script type="text/javascript">
-
-	// In case this file was opened by mistake, redirects to proper test
-	if (window.top.location.href  === document.location.href) {
-
-		window.top.location.href = "vh_not_refreshing_on_chrome.html";
-
-	}
-
-	function setDimension(id, dimension, value) {
-
-		var element = document.getElementById(id);
-
-		element.style[dimension] = value + "px";
-
-	}
-
-	function animate() {
-
-		var viewportHeight = document.documentElement.clientHeight;
-
-		var sizeH = 20;
-
-		var referenceDimension = Math.round(sizeH * viewportHeight / 100);
-
-		setDimension('referenceBoxGrownHorizontallyByJS', 'height', referenceDimension);
-
-		setTimeout(animate, 20);
-	}
-
-	setTimeout(animate, 20);
-
-	var transitionedTestBoxStyle = document.getElementById('testBoxWithTransition').style;
-	transitionedTestBoxStyle.height = "60px";
-</script>
-
-</body>
-</html>
--- a/testing/web-platform/tests/lint.whitelist
+++ b/testing/web-platform/tests/lint.whitelist
@@ -463,17 +463,17 @@ SET TIMEOUT: css/css-transitions-1/chang
 SET TIMEOUT: css/css-transitions-1/events-007.html
 SET TIMEOUT: css/css-transitions-1/support/generalParallelTest.js
 SET TIMEOUT: css/css-transitions-1/support/runParallelAsyncHarness.js
 SET TIMEOUT: css/css-transitions-1/transitions-animatable-properties-01.html
 SET TIMEOUT: css/css-transitions-2/transitioncancel-001.html
 SET TIMEOUT: css/css-values-3/reference/vh_not_refreshing_on_chrome-ref.html
 SET TIMEOUT: css/css-values-3/reference/vh_not_refreshing_on_chrome_iframe-ref.html
 SET TIMEOUT: css/css-values-3/vh_not_refreshing_on_chrome.html
-SET TIMEOUT: css/css-values-3/vh_not_refreshing_on_chrome_iframe.html
+SET TIMEOUT: css/css-values-3/support/vh_not_refreshing_on_chrome_iframe.html
 SET TIMEOUT: css/css-writing-modes-3/orthogonal-parent-shrink-to-fit-001.html
 SET TIMEOUT: css/css-writing-modes-3/orthogonal-parent-shrink-to-fit-001a.html
 SET TIMEOUT: css/css-writing-modes-3/orthogonal-parent-shrink-to-fit-001b.html
 SET TIMEOUT: css/css-writing-modes-3/orthogonal-parent-shrink-to-fit-001c.html
 SET TIMEOUT: css/css-writing-modes-3/orthogonal-parent-shrink-to-fit-001d.html
 SET TIMEOUT: css/css-writing-modes-3/orthogonal-parent-shrink-to-fit-001e.html
 SET TIMEOUT: css/css-writing-modes-3/orthogonal-parent-shrink-to-fit-001f.html
 SET TIMEOUT: css/css-writing-modes-3/orthogonal-parent-shrink-to-fit-001g.html