summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authordpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-26 01:08:55 +0000
committerdpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-26 01:08:55 +0000
commit9f8634d2e7060f157ef9f1050edd8239e68d6bbd (patch)
tree84837ee5e83c9caac874177b185d94d7afd0bde1 /webkit/tools
parent83ab4c8bb6f986ea8b8bda377b0f6b7cee089421 (diff)
downloadchromium_src-9f8634d2e7060f157ef9f1050edd8239e68d6bbd.zip
chromium_src-9f8634d2e7060f157ef9f1050edd8239e68d6bbd.tar.gz
chromium_src-9f8634d2e7060f157ef9f1050edd8239e68d6bbd.tar.bz2
Fix comments in test expectations. Also, the description in my previous
change to this file was wrong, the new values for expectations are 'TEXT', 'IMAGE', and 'IMAGE+TEXT' ('BOTH' is not a valid value). R=ojan BUG=none TEST=none Review URL: http://codereview.chromium.org/245019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27310 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rwxr-xr-xwebkit/tools/layout_tests/test_expectations.txt34
1 files changed, 25 insertions, 9 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 73c18b0..ec7c938 100755
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -8,12 +8,10 @@
// LayoutTests/fast/js/flaky.js = FAIL PASS
// LayoutTests/fast/js/crash.js = CRASH TIMEOUT FAIL PASS
//
-// To add other options:
-// SKIP : LayoutTests/fast/js/no-good.js = TIMEOUT PASS
-// DEBUG : LayoutTests/fast/js/no-good.js = TIMEOUT PASS
-// DEBUG SKIP : LayoutTests/fast/js/no-good.js = TIMEOUT PASS
-// LINUX DEBUG SKIP : LayoutTests/fast/js/no-good.js = TIMEOUT PASS
-// BUG1234 DEBUG MAC : LayoutTests/fast/js/no-good.js = TIMEOUT PASS
+// The format of a test line is as follows:
+// METADATA : relative/path/to/test.html = EXPECTATIONS
+//
+// Valid values for METADATA:
//
// BUG[0-9]+: See this bug for more information. Every test that isn't marked
// WONTFIX should have a BUG annotation.
@@ -22,16 +20,34 @@
// WONTFIX: For tests that we never intend to pass on a given platform.
// DEBUG: Expectations apply only to the debug build.
// RELEASE: Expectations apply only to release build.
-// LINUX/WIN/MAC: Expectations apply only to these platforms.
+// LINUX/WIN/WIN-XP/WIN-VISTA/MAC: Expectations apply only to these platforms.
//
-// The format of a test line is as follows:
-// METADATA : relative/path/to/test.html = EXPECTATIONS
+// Valid values for EXPECTATIONS:
+//
+// PASS: Test should pass
+// CRASH: Test should crash
+// TIMEOUT: Test should timeout
+// IMAGE: Test will produce an incorrect image dump
+// TEXT: Test will produce incorrect text output (either full or simplified)
+// IMAGE+TEXT: Test will produce both incorrect text and images
+// FAIL: Test will produce either incorrect text, images, or both
+//
+// If a line contains multiple expectations, it is considered "flakey",
+// because it means that we're not producing consistent, reliable results.
//
// For example,
// LINUX : LayoutTests/media = PASS FAIL
//
// The above means that all the media tests are flaky, but only on Linux.
//
+// Other examples:
+//
+// SKIP : LayoutTests/fast/js/no-good.js = TIMEOUT PASS
+// DEBUG : LayoutTests/fast/js/no-good.js = TIMEOUT PASS
+// DEBUG SKIP : LayoutTests/fast/js/no-good.js = TIMEOUT PASS
+// LINUX DEBUG SKIP : LayoutTests/fast/js/no-good.js = TIMEOUT PASS
+// BUG1234 DEBUG MAC : LayoutTests/fast/js/no-good.js = TIMEOUT PASS
+//
// Notes:
// -A test cannot be both SLOW and TIMEOUT
// -A test can be included twice, but not via the same path.