Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI Lint/Test/Test262 workflow #37

Merged
merged 24 commits into from
Feb 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
143 changes: 143 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
name: CI
on: [pull_request]

# This file has necessary redundancies since of github actions aren't supporting:
# - the definition of macros, which could be called from each job.
# - reporting the status of steps in the PR (only jobs and workflows are reported).
# Steps between "begin" and "end" should be the same in every job.

jobs:
lint:
name: lint
runs-on: ubuntu-latest

# begin macro

strategy:
fail-fast: false
matrix:
node-version: [13.x]

steps:

- name: Checkout
uses: actions/checkout@v2

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Echo node version
run: node --version

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Cache npm modules
uses: actions/cache@v1
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-

- name: Install dependencies
run: yarn --frozen-lockfile

# end macro

- name: Run yarn lint
run: yarn lint

test:
name: test
runs-on: ubuntu-latest

# begin macro

strategy:
fail-fast: false
matrix:
node-version: [13.x]

steps:

- name: Checkout
uses: actions/checkout@v2

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Echo node version
run: node --version

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Cache npm modules
uses: actions/cache@v1
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-

- name: Install dependencies
run: yarn --frozen-lockfile

# end macro

- name: Run yarn test
run: yarn test

test262:
name: test262
runs-on: ubuntu-latest

# begin macro

strategy:
fail-fast: false
matrix:
node-version: [13.x]

steps:

- name: Checkout
uses: actions/checkout@v2

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Echo node version
run: node --version

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Cache npm modules
uses: actions/cache@v1
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-

- name: Install dependencies
run: yarn --frozen-lockfile

# end macro

- name: Run yarn test262
run: yarn test262
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
"depcheck": "lerna run --no-bail depcheck",
"update": "lernaupdate --dedupe",
"prettier": "lerna run prettier",
"lint": "lerna run --no-bail lint",
"lint": "lerna run lint",
"lint-fix": "lerna run --no-bail lint-fix",
"test": "lerna run --no-bail test",
"test262": "lerna run --no-bail test262",
"build": "lerna run --no-bail build"
"test": "lerna run test",
"test262": "lerna run test262",
"build": "lerna run build"
}
}
5 changes: 2 additions & 3 deletions packages/compartment-shim/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@
"depcheck": "depcheck",
"lint": "eslint '**/*.js'",
"lint-fix": "eslint --fix '**/*.js'",
"test": "tap --no-esm --no-coverage --reporter specy 'test/**/*.test.js'",
"test262": "tap --no-esm --no-coverage --reporter specy test262/test262-run.js"
"test": "tap --no-esm --no-coverage --reporter spec 'test/**/*.test.js'",
"test262": "tap --no-esm --no-coverage --reporter spec test262/test262-run.js"
},
"dependencies": {
"@agoric/intrinsics-global": "0.1.0"
},
"devDependencies": {
"@agoric/tame-function-constructors": "0.1.0",
"@agoric/test262-runner": "0.1.0",
"babel-eslint": "^10.0.3",
"eslint": "^6.8.0",
Expand Down
170 changes: 96 additions & 74 deletions packages/compartment-shim/test262/test262-run.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,34 @@
// eslint-disable-next-line import/no-extraneous-dependencies
import test262Runner from '@agoric/test262-runner';
// eslint-disable-next-line import/no-extraneous-dependencies
import tameFunctionConstructors from '@agoric/tame-function-constructors';
import Compartment from '../src/main.js';

export default function patchFunctionConstructors() {
/* eslint-disable no-proto */

function F() {}

const FC = Object.getOwnPropertyDescriptor(F.__proto__, 'constructor');

Object.defineProperty(F.__proto__, 'constructor', {
...FC,
value: function Function() {
throw new TypeError();
},
});

function restore() {
Object.defineProperty(F.__proto__, 'constructor', FC);
}

return restore;

/* eslint-enable no-proto */
}

test262Runner({
testDirs: [
'/test/built-ins/eval',
'/test/built-ins/function',
'/test/built-ins/Function',
'/test/built-ins/global',
'/test/language/eval-code',
],
Expand All @@ -16,76 +37,76 @@ test262Runner({
'built-ins/eval/name.js',
'built-ins/eval/no-construct.js',
'built-ins/eval/private-identifiers-not-empty.js',
'built-ins/function/15.3.2.1-11-1.js',
'built-ins/function/15.3.2.1-11-2-s.js',
'built-ins/function/15.3.2.1-11-3.js',
'built-ins/function/15.3.2.1-11-4-s.js',
'built-ins/function/15.3.2.1-11-5.js',
'built-ins/function/15.3.2.1-11-6-s.js',
'built-ins/function/15.3.2.1-11-7-s.js',
'built-ins/function/15.3.2.1-11-8-s.js',
'built-ins/function/15.3.2.1-11-9-s.js',
'built-ins/function/15.3.5.4_2-11gs.js',
'built-ins/function/15.3.5.4_2-13gs.js',
'built-ins/function/15.3.5.4_2-7gs.js',
'built-ins/function/15.3.5.4_2-9gs.js',
'built-ins/function/length/S15.3.5.1_A1_T3.js',
'built-ins/function/length/S15.3.5.1_A2_T3.js',
'built-ins/function/length/S15.3.5.1_A3_T3.js',
'built-ins/function/length/S15.3.5.1_A4_T3.js',
'built-ins/function/prototype/apply/S15.3.4.3_A3_T1.js',
'built-ins/function/prototype/apply/S15.3.4.3_A3_T2.js',
'built-ins/function/prototype/apply/S15.3.4.3_A3_T3.js',
'built-ins/function/prototype/apply/S15.3.4.3_A3_T4.js',
'built-ins/function/prototype/apply/S15.3.4.3_A3_T5.js',
'built-ins/function/prototype/apply/S15.3.4.3_A3_T7.js',
'built-ins/function/prototype/apply/S15.3.4.3_A3_T9.js',
'built-ins/function/prototype/apply/S15.3.4.3_A5_T1.js',
'built-ins/function/prototype/apply/S15.3.4.3_A5_T2.js',
'built-ins/function/prototype/apply/S15.3.4.3_A7_T1.js',
'built-ins/function/prototype/apply/S15.3.4.3_A7_T2.js',
'built-ins/function/prototype/apply/S15.3.4.3_A7_T5.js',
'built-ins/function/prototype/apply/S15.3.4.3_A7_T7.js',
'built-ins/function/prototype/apply/S15.3.4.3_A7_T8.js',
'built-ins/function/prototype/bind/15.3.4.5-6-11.js',
'built-ins/function/prototype/bind/15.3.4.5-6-12.js',
'built-ins/function/prototype/bind/15.3.4.5-6-2.js',
'built-ins/function/prototype/bind/15.3.4.5-6-3.js',
'built-ins/function/prototype/bind/15.3.4.5-6-7.js',
'built-ins/function/prototype/call/S15.3.4.4_A3_T1.js',
'built-ins/function/prototype/call/S15.3.4.4_A3_T2.js',
'built-ins/function/prototype/call/S15.3.4.4_A3_T3.js',
'built-ins/function/prototype/call/S15.3.4.4_A3_T4.js',
'built-ins/function/prototype/call/S15.3.4.4_A3_T5.js',
'built-ins/function/prototype/call/S15.3.4.4_A3_T7.js',
'built-ins/function/prototype/call/S15.3.4.4_A3_T9.js',
'built-ins/function/prototype/call/S15.3.4.4_A5_T1.js',
'built-ins/function/prototype/call/S15.3.4.4_A5_T2.js',
'built-ins/function/prototype/call/S15.3.4.4_A6_T1.js',
'built-ins/function/prototype/call/S15.3.4.4_A6_T2.js',
'built-ins/function/prototype/call/S15.3.4.4_A6_T5.js',
'built-ins/function/prototype/call/S15.3.4.4_A6_T7.js',
'built-ins/function/prototype/call/S15.3.4.4_A6_T8.js',
'built-ins/function/prototype/constructor/S15.3.4.1_A1_T1.js',
'built-ins/function/prototype/toString/AsyncFunction.js',
'built-ins/function/prototype/toString/AsyncGenerator.js',
'built-ins/function/prototype/toString/GeneratorFunction.js',
'built-ins/function/prototype/toString/private-method-class-expression.js',
'built-ins/function/prototype/toString/private-method-class-statement.js',
'built-ins/function/prototype/toString/private-static-method-class-expression.js',
'built-ins/function/prototype/toString/private-static-method-class-statement.js',
'built-ins/function/S15.3.2.1_A3_T1.js',
'built-ins/function/S15.3.2.1_A3_T3.js',
'built-ins/function/S15.3.2.1_A3_T6.js',
'built-ins/function/S15.3.2.1_A3_T8.js',
'built-ins/function/S15.3.5_A2_T1.js',
'built-ins/function/S15.3.5_A2_T2.js',
'built-ins/function/S15.3_A3_T1.js',
'built-ins/function/S15.3_A3_T2.js',
'built-ins/function/S15.3_A3_T3.js',
'built-ins/function/S15.3_A3_T4.js',
'built-ins/function/S15.3_A3_T5.js',
'built-ins/function/S15.3_A3_T6.js',
'built-ins/Function/15.3.2.1-11-1.js',
'built-ins/Function/15.3.2.1-11-2-s.js',
'built-ins/Function/15.3.2.1-11-3.js',
'built-ins/Function/15.3.2.1-11-4-s.js',
'built-ins/Function/15.3.2.1-11-5.js',
'built-ins/Function/15.3.2.1-11-6-s.js',
'built-ins/Function/15.3.2.1-11-7-s.js',
'built-ins/Function/15.3.2.1-11-8-s.js',
'built-ins/Function/15.3.2.1-11-9-s.js',
'built-ins/Function/15.3.5.4_2-11gs.js',
'built-ins/Function/15.3.5.4_2-13gs.js',
'built-ins/Function/15.3.5.4_2-7gs.js',
'built-ins/Function/15.3.5.4_2-9gs.js',
'built-ins/Function/length/S15.3.5.1_A1_T3.js',
'built-ins/Function/length/S15.3.5.1_A2_T3.js',
'built-ins/Function/length/S15.3.5.1_A3_T3.js',
'built-ins/Function/length/S15.3.5.1_A4_T3.js',
'built-ins/Function/prototype/apply/S15.3.4.3_A3_T1.js',
'built-ins/Function/prototype/apply/S15.3.4.3_A3_T2.js',
'built-ins/Function/prototype/apply/S15.3.4.3_A3_T3.js',
'built-ins/Function/prototype/apply/S15.3.4.3_A3_T4.js',
'built-ins/Function/prototype/apply/S15.3.4.3_A3_T5.js',
'built-ins/Function/prototype/apply/S15.3.4.3_A3_T7.js',
'built-ins/Function/prototype/apply/S15.3.4.3_A3_T9.js',
'built-ins/Function/prototype/apply/S15.3.4.3_A5_T1.js',
'built-ins/Function/prototype/apply/S15.3.4.3_A5_T2.js',
'built-ins/Function/prototype/apply/S15.3.4.3_A7_T1.js',
'built-ins/Function/prototype/apply/S15.3.4.3_A7_T2.js',
'built-ins/Function/prototype/apply/S15.3.4.3_A7_T5.js',
'built-ins/Function/prototype/apply/S15.3.4.3_A7_T7.js',
'built-ins/Function/prototype/apply/S15.3.4.3_A7_T8.js',
'built-ins/Function/prototype/bind/15.3.4.5-6-11.js',
'built-ins/Function/prototype/bind/15.3.4.5-6-12.js',
'built-ins/Function/prototype/bind/15.3.4.5-6-2.js',
'built-ins/Function/prototype/bind/15.3.4.5-6-3.js',
'built-ins/Function/prototype/bind/15.3.4.5-6-7.js',
'built-ins/Function/prototype/call/S15.3.4.4_A3_T1.js',
'built-ins/Function/prototype/call/S15.3.4.4_A3_T2.js',
'built-ins/Function/prototype/call/S15.3.4.4_A3_T3.js',
'built-ins/Function/prototype/call/S15.3.4.4_A3_T4.js',
'built-ins/Function/prototype/call/S15.3.4.4_A3_T5.js',
'built-ins/Function/prototype/call/S15.3.4.4_A3_T7.js',
'built-ins/Function/prototype/call/S15.3.4.4_A3_T9.js',
'built-ins/Function/prototype/call/S15.3.4.4_A5_T1.js',
'built-ins/Function/prototype/call/S15.3.4.4_A5_T2.js',
'built-ins/Function/prototype/call/S15.3.4.4_A6_T1.js',
'built-ins/Function/prototype/call/S15.3.4.4_A6_T2.js',
'built-ins/Function/prototype/call/S15.3.4.4_A6_T5.js',
'built-ins/Function/prototype/call/S15.3.4.4_A6_T7.js',
'built-ins/Function/prototype/call/S15.3.4.4_A6_T8.js',
'built-ins/Function/prototype/constructor/S15.3.4.1_A1_T1.js',
'built-ins/Function/prototype/toString/AsyncFunction.js',
'built-ins/Function/prototype/toString/AsyncGenerator.js',
'built-ins/Function/prototype/toString/GeneratorFunction.js',
'built-ins/Function/prototype/toString/private-method-class-expression.js',
'built-ins/Function/prototype/toString/private-method-class-statement.js',
'built-ins/Function/prototype/toString/private-static-method-class-expression.js',
'built-ins/Function/prototype/toString/private-static-method-class-statement.js',
'built-ins/Function/S15.3.2.1_A3_T1.js',
'built-ins/Function/S15.3.2.1_A3_T3.js',
'built-ins/Function/S15.3.2.1_A3_T6.js',
'built-ins/Function/S15.3.2.1_A3_T8.js',
'built-ins/Function/S15.3.5_A2_T1.js',
'built-ins/Function/S15.3.5_A2_T2.js',
'built-ins/Function/S15.3_A3_T1.js',
'built-ins/Function/S15.3_A3_T2.js',
'built-ins/Function/S15.3_A3_T3.js',
'built-ins/Function/S15.3_A3_T4.js',
'built-ins/Function/S15.3_A3_T5.js',
'built-ins/Function/S15.3_A3_T6.js',
'language/eval-code/direct/',
'language/eval-code/indirect/always-non-strict.js',
'language/eval-code/indirect/cptn-nrml-expr-obj.js',
Expand Down Expand Up @@ -135,9 +156,10 @@ test262Runner({
],
async test(testInfo, harness, { applyCorrections }) {
// The test itself.
tameFunctionConstructors();
const restore = patchFunctionConstructors();
const c = new Compartment();
const contents = applyCorrections(testInfo.contents);
c.evaluate(`${harness}\n${contents}`);
restore();
},
});
2 changes: 1 addition & 1 deletion packages/enable-property-overrides/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"depcheck": "depcheck",
"lint-fix": "eslint --fix '**/*.js'",
"lint": "eslint '**/*.js'",
"test": "tap --no-esm --no-coverage --reporter specy 'test/**/*.test.js'"
"test": "tap --no-esm --no-coverage --reporter spec 'test/**/*.test.js'"
},
"devDependencies": {
"@agoric/make-hardener": "0.0.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/error-stack-shim/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"scripts": {
"lint": "eslint '**/*.js'",
"lint-fix": "eslint --fix '**/*.js'",
"test": "tap --no-esm --no-coverage --reporter specy 'test/**/*.test.js'"
"test": "tap --no-esm --no-coverage --reporter spec 'test/**/*.test.js'"
},
"dependencies": {
"@agoric/harden": "0.0.4",
Expand Down
Loading