updates from rfc discussion

Author: jcscottiii

.github/workflows/update-test262-tests.yml

@@ -21,8 +21,19 @@ jobs:
           path: test262-spec
       - name: Copy Test262 tests to WPT
         run: |
-          rsync -a --delete test262-spec/test/ wpt/tc39/test262/test/
-          rsync -a --delete test262-spec/harness/ wpt/tc39/test262/harness/
+          LATEST_SHA=$(git -C test262-spec rev-parse HEAD)
+          echo "Latest remote Test262 SHA: $LATEST_SHA"
+
+          mkdir -p wpt/third_party/test262/test/
+          mkdir -p wpt/third_party/test262/harness/
+          rsync -a --delete test262-spec/test/ wpt/third_party/test262/test/
+          rsync -a --delete test262-spec/harness/ wpt/third_party/test262/harness/
+          cat <<EOF > wpt/third_party/test262/vendored.toml
+[test262]
+source = "https://github.com/tc39/test262"
+rev = "${LATEST_SHA}"
+EOF
+
       - name: Commit changes
         id: commit
         continue-on-error: true
@@ -32,8 +43,8 @@ jobs:
           echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
           git config user.name "$GIT_AUTHOR_NAME"
           git config user.email "$GIT_AUTHOR_EMAIL"
-          git checkout -b $BRANCH_NAME
-          git add tc39/test262/
+          git checkout -B $BRANCH_NAME
+          git add third_party/test262/
           git commit -m "$COMMIT_TITLE"
         env:
           GIT_AUTHOR_NAME: "wpt-pr-bot"

lint.ignore

@@ -839,4 +839,4 @@ PROMISE_REJECTS: wasm/core/js/harness/testharness.js
 # Legitimate use of test_driver_internal
 TEST DRIVER INTERNAL: resources/testdriver.js
 
-*: tc39/*
+*: third_party/test262/*

tools/ci/tc/tasks/test.yml

@@ -41,6 +41,12 @@ components:
     vars:
       test-type: crashtest
 
+  wpt-test262:
+    chunks: 16
+    vars:
+      test-type: test262
+
+
   run-options:
     options:
       xvfb: true
@@ -159,6 +165,8 @@ tasks:
             suite: wdspec
         - vars:
             suite: crashtest
+        - vars:
+            suite: test262
       do:
         $map:
           for:

tools/serve/serve.py

@@ -24,7 +24,7 @@
 from localpaths import repo_root  # type: ignore
 
 from manifest.sourcefile import read_script_metadata, js_meta_re, parse_variants  # type: ignore
-from manifest.test262 import TestRecord
+from manifest.test262 import TestRecord # type: ignore
 from wptserve import server as wptserve, handlers
 from wptserve import stash
 from wptserve import config
@@ -352,8 +352,8 @@ class Test262WindowTestHandler(HtmlWrapperHandler):
 <meta charset=utf-8>
 <title>%(path)s</title>
 <script src="/resources/test262/testharness-client.js"></script>
-<script src="/tc39/test262/harness/assert.js"></script>
-<script src="/tc39/test262/harness/sta.js"></script>
+<script src="/third_party/test262/harness/assert.js"></script>
+<script src="/third_party/test262/harness/sta.js"></script>
 <script src="/resources/test262/harness-adapter.js"></script>
 %(meta)s
 %(script)s"""
@@ -365,7 +365,7 @@ def _get_metadata(self, request):
         path = self._get_filesystem_path(request)
         with open(path, encoding='ISO-8859-1') as f:
             test_record = TestRecord.parse(f.read(), path)
-        yield from (('script', "/tc39/test262/harness/%s" % filename)
+        yield from (('script', "/third_party/test262/harness/%s" % filename)
                     for filename in test_record.get("includes", []))
         expected_error = test_record.get('negative', {}).get('type', None)
         if expected_error is not None:

tools/serve/test_serve.py

@@ -223,8 +223,8 @@ def test_test262_window_test_handler_get_metadata_includes(test262_handlers: Any
     handler = Test262WindowTestHandler(base_path=tests_root, url_base=url_base)
     mock_request = _create_mock_request("/test262/basic.test262-test.html")
     metadata = list(handler._get_metadata(mock_request))
-    assert ('script', '/tc39/test262/harness/assert.js') in metadata
-    assert ('script', '/tc39/test262/harness/sta.js') in metadata
+    assert ('script', '/third_party/test262/harness/assert.js') in metadata
+    assert ('script', '/third_party/test262/harness/sta.js') in metadata
 
 
 def test_test262_window_test_handler_get_metadata_negative(test262_handlers: Any) -> None:
@@ -245,8 +245,8 @@ def test_test262_window_test_handler_wrapper_content(test262_handlers: Any) -> N
     handler.handle_request(mock_request, mock_response)
     content = mock_response.content
     assert "<script src=\"/resources/test262/testharness-client.js\"></script>" in content
-    assert "<script src=\"/tc39/test262/harness/assert.js\"></script>" in content
-    assert "<script src=\"/tc39/test262/harness/sta.js\"></script>" in content
+    assert "<script src=\"/third_party/test262/harness/assert.js\"></script>" in content
+    assert "<script src=\"/third_party/test262/harness/sta.js\"></script>" in content
     assert "<script>test262Setup()</script>" in content
     assert "<script src=\"/test262/basic.js\"></script>" in content
     assert "<script>test262Done()</script>" in content