Bug 1097230 - Build and configuration changes for web-platform-tests update. r=ted
authorJames Graham <james@hoppipolla.co.uk>
Thu, 20 Nov 2014 16:30:00 +0000
changeset 243079 a6edf0bb1e972735f1681f9baa47812f3fab9fb5
parent 243078 133cef79f41bfcd43047121ecc9906f53f4668af
child 243080 f642698590301f923237de6d2479429096b61edd
push id660
push userraliiev@mozilla.com
push dateWed, 18 Feb 2015 20:30:48 +0000
treeherdermozilla-release@49e493494178 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1097230
milestone36.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 1097230 - Build and configuration changes for web-platform-tests update. r=ted
testing/web-platform/Makefile.in
testing/web-platform/moz.build
testing/web-platform/mozilla/README
testing/web-platform/mozilla/meta/MANIFEST.json
testing/web-platform/mozilla/tests/placeholder
testing/web-platform/outbound/README
testing/web-platform/outbound/meta/MANIFEST.json
testing/web-platform/outbound/tests/placeholder
testing/web-platform/runtests.py
testing/web-platform/wptrunner.ini
--- a/testing/web-platform/Makefile.in
+++ b/testing/web-platform/Makefile.in
@@ -1,33 +1,9 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-WPT_TESTS = \
-  tests \
-  $(NULL)
-
-WPT_METADATA = \
-  meta \
-  $(NULL)
-
-
-_DEST_DIR = $(DEPTH)/_tests/web-platform
 PKG_STAGE = $(DIST)/test-stage
 
-WEBPLATFORM_FILES = \
-  runtests.py \
-  wptrunner.ini \
-  $(NULL)
-WEBPLATFORM_DEST = $(_DEST_DIR)
-INSTALL_TARGETS += WEBPLATFORM
-
-libs::
-	$(INSTALL) $(topsrcdir)/testing/web-platform/harness/wptrunner $(_DEST_DIR)
-libs:: $(WPT_TESTS)
-	$(INSTALL) $(foreach f,$^,"$f") $(_DEST_DIR)
-libs:: $(WPT_METADATA)
-	$(INSTALL) $(foreach f,$^,"$f") $(_DEST_DIR)
-
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/web-platform
 	@cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/web-platform
 	@(cd $(DEPTH)/_tests/ && tar $(TAR_CREATE_FLAGS) - web-platform) | (cd $(PKG_STAGE) && tar -xf -)
--- a/testing/web-platform/moz.build
+++ b/testing/web-platform/moz.build
@@ -1,6 +1,15 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+TEST_HARNESS_FILES['web-platform'] += [
+    'harness/**',
+    'meta/**',
+    'mozilla/**',
+    'outbound/**',
+    'runtests.py',
+    'tests/**',
+    'wptrunner.ini'
+]
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/mozilla/README
@@ -0,0 +1,4 @@
+This directory is intended for web-platform-tests that currently
+cannot be upstreamed for some reason (e.g. because they depend on
+gecko-specific APIs). When run they are mounted on the server under
+/_mozilla/.
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/mozilla/meta/MANIFEST.json
@@ -0,0 +1,16 @@
+{
+  "items": {
+    "helper": [],
+    "manual": [],
+    "reftest": [],
+    "stub": [],
+    "testharness": [],
+    "wdspec": []
+  },
+  "local_changes": {
+    "deleted": [],
+    "items": {}
+  },
+  "rev": null,
+  "url_base": "/_mozilla/"
+}
\ No newline at end of file
copy from testing/web-platform/moz.build
copy to testing/web-platform/mozilla/tests/placeholder
--- a/testing/web-platform/moz.build
+++ b/testing/web-platform/mozilla/tests/placeholder
@@ -1,6 +1,6 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+This is a placeholder file to ensure that this directory remains
+in source control and test packages even when it is otherwise empty.
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/outbound/README
@@ -0,0 +1,7 @@
+This directory is intended for web-platform-tests that should be
+upstreamed. The intent is to make this an automatic process, however
+that does not work yet.
+
+ When run they are mounted on the server under /_outbound/. Note that
+this will change when the tests are upstreamed, so using absolute URLs
+in tests should be avoided where possible.
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/outbound/meta/MANIFEST.json
@@ -0,0 +1,16 @@
+{
+  "items": {
+    "helper": [],
+    "manual": [],
+    "reftest": [],
+    "stub": [],
+    "testharness": [],
+    "wdspec": []
+  },
+  "local_changes": {
+    "deleted": [],
+    "items": {}
+  },
+  "rev": null,
+  "url_base": "/_outbound/"
+}
\ No newline at end of file
copy from testing/web-platform/moz.build
copy to testing/web-platform/outbound/tests/placeholder
--- a/testing/web-platform/moz.build
+++ b/testing/web-platform/outbound/tests/placeholder
@@ -1,6 +1,6 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+This is a placeholder file to ensure that this directory remains
+in source control and test packages even when it is otherwise empty.
\ No newline at end of file
--- a/testing/web-platform/runtests.py
+++ b/testing/web-platform/runtests.py
@@ -1,14 +1,18 @@
 #!/usr/bin/env python
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+import os
 import sys
 
+here = os.path.split(os.path.abspath(__file__))[0]
+sys.path.insert(0, os.path.join(here, "harness"))
+
 from wptrunner import wptrunner
 
 if __name__ == "__main__":
     success = wptrunner.main()
     if not success:
         sys.exit(1)
--- a/testing/web-platform/wptrunner.ini
+++ b/testing/web-platform/wptrunner.ini
@@ -2,10 +2,25 @@
 firefox =
 
 [web-platform-tests]
 remote_url = https://github.com/w3c/web-platform-tests.git
 branch = master
 sync_path = sync
 
 [paths]
+prefs = ../profiles
+run_info = .
+
+[manifest:upstream]
 tests = tests
 metadata = meta
+url_base = /
+
+[manifest:outbound]
+tests = outbound/tests
+metadata = outbound/meta
+url_base = /_outbound/
+
+[manifest:mozilla]
+tests = mozilla/tests
+metadata = mozilla/meta
+url_base = /_mozilla/
\ No newline at end of file