Rename usage of master to main

Ref #2699
This commit is contained in:
Leo Balter 2020-07-15 11:53:19 -07:00 committed by Rick Waldron
parent e193b449d4
commit 2e127ec40e
15 changed files with 24 additions and 24 deletions

View File

@ -1,4 +1,4 @@
name: Updates the master branch after main
name: Updates the main branch after main
on:
push:
branches:
@ -14,4 +14,4 @@ jobs:
fetch-depth: 0
- name: Push
run: |
git push origin HEAD:master
git push origin HEAD:main

View File

@ -250,10 +250,10 @@ function Test262Error(message) {
## Rules For Module `_FIXTURE.js` Files
The [Module section of INTERPRETING.md](https://github.com/tc39/test262/blob/master/INTERPRETING.md#modules) states that `_FIXTURE.js` files will not have have Realm modifications applied. In practice, this means that code in `_FIXTURE.js` files must abide by the following rules:
The [Module section of INTERPRETING.md](https://github.com/tc39/test262/blob/HEAD/INTERPRETING.md#modules) states that `_FIXTURE.js` files will not have have Realm modifications applied. In practice, this means that code in `_FIXTURE.js` files must abide by the following rules:
- **MUST NOT** refer to, or make use of any [Test262-Defined Bindings](https://github.com/tc39/test262/blob/master/INTERPRETING.md#test262-defined-bindings) in any way.
- **MUST NOT** refer to, or make use of any [Host-Defined Functions](https://github.com/tc39/test262/blob/master/INTERPRETING.md#host-defined-functions) in any way.
- **MUST NOT** refer to, or make use of any [Test262-Defined Bindings](https://github.com/tc39/test262/blob/HEAD/INTERPRETING.md#test262-defined-bindings) in any way.
- **MUST NOT** refer to, or make use of any [Host-Defined Functions](https://github.com/tc39/test262/blob/HEAD/INTERPRETING.md#host-defined-functions) in any way.
## Handling Errors and Negative Test Cases

View File

@ -107,7 +107,7 @@ properties of the global scope prior to test execution.
sleeps the execution for approximately that duration.
- **`monotonicNow`** - a function that returns a value that conforms to [`DOMHighResTimeStamp`][] and is produced in such a way that its semantics conform to **[Monotonic Clock][]**.
In addition, consumers may choose to override any of the [the available test harness helper functions](https://github.com/tc39/test262/blob/master/CONTRIBUTING.md#test-environment) as they see fit. See [the documentation on handling errors and negative test cases](https://github.com/tc39/test262/blob/master/CONTRIBUTING.md#handling-errors-and-negative-test-cases) for a useful example of this.
In addition, consumers may choose to override any of the [the available test harness helper functions](https://github.com/tc39/test262/blob/HEAD/CONTRIBUTING.md#test-environment) as they see fit. See [the documentation on handling errors and negative test cases](https://github.com/tc39/test262/blob/HEAD/CONTRIBUTING.md#handling-errors-and-negative-test-cases) for a useful example of this.
#### Normative references
@ -138,7 +138,7 @@ This must precede any additional text modifications described by test metadata.
### Modules
Test262 includes tests for ECMAScript 2015 module code, denoted by the "module"
metadata flag. Files bearing a name ending in `_FIXTURE.js` **MUST NOT** be interpreted as standalone tests; they are intended to be referenced by test files. Realm modifications, including [Test262-Defined Bindings](#test262-defined-bindings) and [Host-Defined Functions](#host-defined-functions), are not applied to code executed from `_FIXTURE.js` files. See the [**Rules For Module `_FIXTURE.js` Files** section of CONTRIBUTING.md](https://github.com/tc39/test262/blob/master/CONTRIBUTING.md#rules-for-module-fixturejs-files) for more information.
metadata flag. Files bearing a name ending in `_FIXTURE.js` **MUST NOT** be interpreted as standalone tests; they are intended to be referenced by test files. Realm modifications, including [Test262-Defined Bindings](#test262-defined-bindings) and [Host-Defined Functions](#host-defined-functions), are not applied to code executed from `_FIXTURE.js` files. See the [**Rules For Module `_FIXTURE.js` Files** section of CONTRIBUTING.md](https://github.com/tc39/test262/blob/HEAD/CONTRIBUTING.md#rules-for-module-fixturejs-files) for more information.
All module specifiers used by Test262 begin with the character sequence `./`.
The remaining characters should be interpreted as the name of a file within the

View File

@ -82,12 +82,12 @@ defines:
* meet its termination condition and the test will hang indefinitely.
*
* Because we've defined $262.agent.broadcast(SAB) in
* https://github.com/tc39/test262/blob/master/INTERPRETING.md, there are host implementations
* https://github.com/tc39/test262/blob/HEAD/INTERPRETING.md, there are host implementations
* that assume compatibility, which must be maintained.
*
*
* $262.agent.safeBroadcast(TA) should not be included in
* https://github.com/tc39/test262/blob/master/INTERPRETING.md
* https://github.com/tc39/test262/blob/HEAD/INTERPRETING.md
*
*
* @param {(Int32Array|BigInt64Array)} typedArray An Int32Array or BigInt64Array with a SharedArrayBuffer

View File

@ -53,7 +53,7 @@ def clean():
def deploy():
shell('git', 'add', '--all', OUT_DIR)
shell('git', 'commit', '--message', '"Re-build from source"')
shell('git', 'push', UPSTREAM, 'master')
shell('git', 'push', UPSTREAM, 'main')
shell('git', 'checkout', '-')
# Generate a deploy key for use in a continuous integration system, allowing

View File

@ -19,7 +19,7 @@
"scripts": {
"ci": "./tools/scripts/ci_test.sh",
"test": "test262-harness",
"diff": "git diff --diff-filter ACMR --name-only master.. -- test/ && git ls-files --exclude-standard --others -- test/",
"diff": "git diff --diff-filter ACMR --name-only main.. -- test/ && git ls-files --exclude-standard --others -- test/",
"test:diff": "npm run test:diff:v8 && npm run test:diff:spidermonkey && npm run test:diff:chakra && npm run test:diff:javascriptcore",
"test:diff:v8": "test262-harness -t 8 --hostType=d8 --hostPath=v8 $(npm run --silent diff)",
"test:diff:spidermonkey": "test262-harness -t 8 --hostType=jsshell --hostPath=spidermonkey $(npm run --silent diff)",

View File

@ -1,5 +1,5 @@
// Copyright (c) 2014 Ecma International. All rights reserved.
// See LICENSE or https://github.com/tc39/test262/blob/master/LICENSE
// See LICENSE or https://github.com/tc39/test262/blob/HEAD/LICENSE
/*---
esid: sec-array.prototype.concat

View File

@ -1,5 +1,5 @@
// Copyright (c) 2014 Ecma International. All rights reserved.
// See LICENSE or https://github.com/tc39/test262/blob/master/LICENSE
// See LICENSE or https://github.com/tc39/test262/blob/HEAD/LICENSE
/*---
esid: sec-array.prototype.concat

View File

@ -15,7 +15,7 @@ _LICENSE_PATTERN = re.compile(
r'// Use of this source code is governed by a BSD-style license that can be[\r\n]{1,2}' +
r'// found in the LICENSE file\.' +
r'|' +
r'// See LICENSE or https://github\.com/tc39/test262/blob/master/LICENSE' +
r'// See LICENSE or https://github\.com/tc39/test262/blob/main/LICENSE' +
r')', re.IGNORECASE)
class CheckLicense(Check):

View File

@ -1,6 +1,6 @@
^ expected errors | v input
// Copyright (C) 2017 Mike Pennisi. All rights reserved.
// See LICENSE or https://github.com/tc39/test262/blob/master/LICENSE
// See LICENSE or https://github.com/tc39/test262/blob/HEAD/LICENSE
/*---
esid: sec-assignment-operators-static-semantics-early-errors
description: Minimal test

View File

@ -26,7 +26,7 @@ _LICENSE_PATTERN = re.compile(
r'// Use of this source code is governed by a BSD-style license that can be[\r\n]{1,2}' +
r'// found in the LICENSE file\.' +
r'|' +
r'// See LICENSE or https://github\.com/tc39/test262/blob/master/LICENSE' +
r'// See LICENSE or https://github\.com/tc39/test262/blob/main/LICENSE' +
r')[\r\n]{1,2}' + _BLANK_LINES, re.IGNORECASE)
yamlLoad = None

View File

@ -6,6 +6,6 @@ fi
if [ -n "$(git status --porcelain)" -a "$CIRCLE_PULL_REQUEST" != "" ]; then
echo New changes were found after re-generating the tests.
echo Please, read the documentation on procedurally generated tests
echo 'https://github.com/tc39/test262/blob/master/CONTRIBUTING.md#procedurally-generated-tests'
echo 'https://github.com/tc39/test262/blob/HEAD/CONTRIBUTING.md#procedurally-generated-tests'
exit 1
fi

View File

@ -1,7 +1,7 @@
#!/bin/bash
if [ "$CIRCLE_PULL_REQUEST" != "" ]; then
paths=$(git diff --diff-filter ACMR --name-only origin/master.. -- test/)
paths=$(git diff --diff-filter ACMR --name-only origin/main.. -- test/)
if [ "$paths" == "" ]; then
echo No test files added or modified. Exiting.

View File

@ -1,7 +1,7 @@
#!/bin/bash
if [ "$CIRCLE_PULL_REQUEST" != "" ]; then
paths=$(git diff --diff-filter ACMR --name-only origin/master.. -- test/)
paths=$(git diff --diff-filter ACMR --name-only origin/main.. -- test/)
if [ "$paths" == "" ]; then
echo No test files added or modified. Exiting.

View File

@ -1,6 +1,6 @@
#!/bin/sh
if [ $CIRCLE_EVENT_TYPE != "push" -o $CIRCLE_BRANCH != "master" ]; then
echo This job is not running against a commit that has been merged to master.
if [ $CIRCLE_EVENT_TYPE != "push" -o $CIRCLE_BRANCH != "main" ]; then
echo This job is not running against a commit that has been merged to main.
echo Skipping deployment.
exit 0
fi
@ -16,9 +16,9 @@ ssh-add github-deploy-key
rm github-deploy-key
git config --global user.email "test262@ecma-international.org"
git config --global user.name "Test262 Automation Script"
# The repository on TravisCI is a shallow clone, so the `master` branch must
# The repository on TravisCI is a shallow clone, so the `main` branch must
# be retrieved explicitly, and a local branch created from the `FETCH_HEAD`
# git reference
git fetch origin master
git branch master FETCH_HEAD
git fetch origin main
git branch main FETCH_HEAD
./make.py deploy