Bug 1097230 - Build and configuration changes for web-platform-tests update. r=ted

--HG--
rename : testing/web-platform/moz.build => testing/web-platform/mozilla/tests/placeholder
rename : testing/web-platform/moz.build => testing/web-platform/outbound/tests/placeholder
extra : rebase_source : 45498e733e8de0631e75b50a9a38138a82414c53

testing/web-platform/Makefile.in

@@ -1,32 +1,8 @@
 # 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

testing/web-platform/moz.build

@@ -4,3 +4,12 @@
 # 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'
+]

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/.

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/"
+}

testing/web-platform/mozilla/tests/placeholder

@@ -0,0 +1,6 @@
+# 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.

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.

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/"
+}

testing/web-platform/outbound/tests/placeholder

@@ -0,0 +1,6 @@
+# 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.

testing/web-platform/runtests.py

@@ -4,8 +4,12 @@
 # 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__":

testing/web-platform/wptrunner.ini

@@ -7,5 +7,20 @@ 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/