Skip to content

Commit b9c1a69

Browse files
committed
fix: make separate 'test:xs' target, remove XS from 'test' target
Running `yarn test` from the top level causes `yarn test` to be run in each workspace. Previously, in some packages (zoe and ERTP in particular), the local `yarn test` expanded into doing both `test:node` and `test:xs`. This introduces a new top-level `yarn test:xs` target, which runs `yarn test:xs` in each workspace. Zoe and ERTP's local `yarn test` was changed to only run the node tests. Zoe and ERTP 's local `yarn test:xs` runs the unit tests under XS. All other packages have a no-op `exit 0` in their `test:xs` target, so the top-level target doesn't crash when it encounters a package that doesn't have any XS-specific testing (which is most of them). With this change, CI will stop testing XS on each run. We'll follow up with a separate change that tells CI to do a top-level `yarn test:xs`, probably with a flag that makes the success optional (don't flunk a PR if it fails the XS tests, for now). refs #2647
1 parent 35fceb1 commit b9c1a69

File tree

41 files changed

+45
-7
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+45
-7
lines changed

golang/cosmos/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"build:gyp": "make compile-gyp",
1616
"build:gyp-debug": "make compile-gyp GYP_DEBUG=--debug",
1717
"test:nyc": "nyc ava",
18+
"test:xs": "exit 0",
1819
"build": "exit 0",
1920
"lint-fix": "eslint --fix '**/*.js'",
2021
"lint-check": "eslint '**/*.js'"

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
"lint-check": "yarn workspaces run lint-check",
7676
"lint": "yarn workspaces run lint-check",
7777
"test": "yarn workspaces run test",
78+
"test:xs": "yarn workspaces run test:xs",
7879
"build": "yarn workspaces run build",
7980
"postinstall": "patch-package",
8081
"patch-package": "patch-package",

packages/ERTP/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
},
1212
"scripts": {
1313
"build": "exit 0",
14-
"test": "yarn test:node && yarn test:xs",
15-
"test:node": "ava",
14+
"test": "ava",
1615
"test:xs": "yarn test:xs-unit && yarn test:xs-worker",
1716
"test:xs-unit": "ava-xs",
1817
"test:xs-worker": "WORKER_TYPE=xs-worker ava",

packages/SwingSet/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"scripts": {
1717
"build": "exit 0",
1818
"test": "ava",
19+
"test:xs": "exit 0",
1920
"test:xs-worker": "ava test/workers/test-worker.js -m 'xs vat manager'",
2021
"pretty-fix": "prettier --write '**/*.js'",
2122
"pretty-check": "prettier --check '**/*.js'",

packages/acorn-eventual-send/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"scripts": {
1010
"build": "exit 0",
1111
"test": "ava",
12+
"test:xs": "exit 0",
1213
"lint-fix": "eslint --fix '**/*.js'",
1314
"lint-check": "eslint '**/*.js'"
1415
},

packages/agoric-cli/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"scripts": {
1515
"build": "exit 0",
1616
"test": "ava --config .ava-unit-test.config.js",
17+
"test:xs": "exit 0",
1718
"integration-test": "ava --config .ava-integration-test.config.js",
1819
"lint-check": "eslint '**/*.{js,jsx}'",
1920
"lint-fix": "eslint --fix '**/*.{js,jsx}'"

packages/assert/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"build": "exit 0",
1414
"test": "exit 0",
1515
"test:nyc": "exit 0",
16+
"test:xs": "exit 0",
1617
"lint-fix": "yarn lint --fix",
1718
"lint-check": "yarn lint",
1819
"lint": "yarn lint:types && yarn lint:eslint",

packages/base64/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
"lint-fix": "eslint --fix '**/*.js'",
2929
"prepublish": "yarn clean && yarn build",
3030
"test": "ava",
31-
"test:nyc": "nyc ava"
31+
"test:nyc": "nyc ava",
32+
"test:xs": "exit 0"
3233
},
3334
"devDependencies": {
3435
"@rollup/plugin-node-resolve": "^6.1.0",

packages/bundle-source/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"build": "exit 0",
1111
"test": "ava",
1212
"test:nyc": "nyc ava",
13+
"test:xs": "exit 0",
1314
"lint-fix": "eslint --fix '**/*.js'",
1415
"lint-check": "eslint '**/*.js'",
1516
"lint-fix-jessie": "eslint -c '.eslintrc-jessie.js' --fix '**/*.js'",

packages/captp/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"build": "exit 0",
3131
"test": "ava",
3232
"test:nyc": "nyc ava",
33+
"test:xs": "exit 0",
3334
"lint-fix": "eslint --fix '**/*.js'",
3435
"lint-check": "eslint 'lib/*.js'"
3536
},

packages/cosmic-swingset/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"build": "exit 0",
1212
"test": "ava",
1313
"test:nyc": "nyc ava",
14+
"test:xs": "exit 0",
1415
"pretty-fix": "prettier --write '**/*.js'",
1516
"pretty-check": "prettier --check '**/*.js'",
1617
"lint-fix": "yarn lint --fix",

packages/dapp-svelte-wallet/api/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"scripts": {
77
"build": "exit 0",
88
"test": "ava",
9+
"test:xs": "exit 0",
910
"lint": "yarn lint:types && yarn lint:eslint",
1011
"lint-fix": "yarn lint --fix",
1112
"lint-check": "yarn lint",

packages/dapp-svelte-wallet/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"lint-fix": "exit 0",
2121
"lint-check": "exit 0",
2222
"test": "exit 0",
23+
"test:xs": "exit 0",
2324
"build": "exit 0"
2425
},
2526
"dependencies": {

packages/dapp-svelte-wallet/ui/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"lint-check": "yarn lint",
1111
"lint-fix": "exit 0",
1212
"lint": "exit 0",
13-
"test": "exit 0"
13+
"test": "exit 0",
14+
"test:xs": "exit 0"
1415
},
1516
"devDependencies": {
1617
"@agoric/captp": "^1.7.2",

packages/deploy-script-support/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"build": "exit 0",
1414
"test": "ava",
1515
"test:nyc": "nyc ava",
16+
"test:xs": "exit 0",
1617
"pretty-fix": "prettier --write '**/*.js'",
1718
"pretty-check": "prettier --check '**/*.js'",
1819
"lint-fix": "yarn lint --fix",

packages/deployment/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"main": "main.js",
1010
"scripts": {
1111
"test": "exit 0",
12+
"test:xs": "exit 0",
1213
"build": "exit 0",
1314
"lint-fix": "eslint --fix '**/*.js'",
1415
"lint-check": "eslint '**/*.js'"

packages/eslint-config/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"scripts": {
1717
"test": "exit 0",
1818
"test:nyc": "exit 0",
19+
"test:xs": "exit 0",
1920
"build": "exit 0",
2021
"lint-fix": "exit 0",
2122
"lint-check": "exit 0"

packages/eslint-plugin/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"main": "lib/index.js",
1212
"scripts": {
1313
"test": "exit 0",
14+
"test:xs": "exit 0",
1415
"build": "exit 0",
1516
"lint-fix": "exit 0",
1617
"lint-check": "exit 0"

packages/eventual-send/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"scripts": {
1111
"test": "ava",
1212
"test:nyc": "nyc ava",
13+
"test:xs": "exit 0",
1314
"build": "exit 0",
1415
"lint-fix": "eslint --fix '**/*.js'",
1516
"lint-check": "eslint '**/*.js'"

packages/import-bundle/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"scripts": {
1414
"test": "ava",
1515
"test:nyc": "nyc ava",
16+
"test:xs": "exit 0",
1617
"build": "exit 0",
1718
"lint-fix": "eslint --fix '**/*.js'",
1819
"lint-check": "eslint '**/*.js'"

packages/import-manager/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"scripts": {
1313
"build": "exit 0",
1414
"test": "ava",
15+
"test:xs": "exit 0",
1516
"lint-fix": "eslint --fix '**/*.js'",
1617
"lint-check": "eslint '**/*.js'"
1718
},

packages/install-metering-and-ses/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"scripts": {
1010
"build": "exit 0",
1111
"test": "ava",
12+
"test:xs": "exit 0",
1213
"lint-fix": "eslint --fix '**/*.js'",
1314
"lint-check": "eslint '**/*.js'"
1415
},

packages/install-ses/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"scripts": {
1010
"build": "exit 0",
1111
"test": "ava",
12+
"test:xs": "exit 0",
1213
"lint-fix": "eslint --fix '**/*.js'",
1314
"lint-check": "eslint '**/*.js'"
1415
},

packages/marshal/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"build": "exit 0",
1414
"test": "ava",
1515
"test:nyc": "nyc ava",
16+
"test:xs": "exit 0",
1617
"pretty-fix": "prettier --write '**/*.js'",
1718
"pretty-check": "prettier --check '**/*.js'",
1819
"lint-fix": "yarn lint --fix",

packages/notifier/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"build": "exit 0",
1414
"test": "ava",
1515
"test:nyc": "nyc ava",
16+
"test:xs": "exit 0",
1617
"lint-fix": "yarn lint --fix",
1718
"lint-check": "yarn lint",
1819
"lint": "yarn lint:types && yarn lint:eslint",

packages/promise-kit/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"scripts": {
1313
"build": "exit 0",
1414
"test": "exit 0",
15+
"test:xs": "exit 0",
1516
"lint-fix": "yarn lint --fix",
1617
"lint-check": "yarn lint",
1718
"lint": "yarn lint:types && yarn lint:eslint",

packages/registrar/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"build": "exit 0",
1414
"test": "ava",
1515
"test:nyc": "nyc ava",
16+
"test:xs": "exit 0",
1617
"lint-fix": "eslint --fix '**/*.js'",
1718
"lint-check": "eslint '**/*.js'"
1819
},

packages/same-structure/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"scripts": {
1313
"build": "exit 0",
1414
"test": "exit 0",
15+
"test:xs": "exit 0",
1516
"lint-fix": "eslint --fix '**/*.js'",
1617
"lint-check": "eslint '**/*.js'"
1718
},

packages/sharing-service/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"build": "exit 0",
1414
"test": "ava",
1515
"test:nyc": "nyc ava",
16+
"test:xs": "exit 0",
1617
"lint-fix": "eslint --fix '**/*.js'",
1718
"lint-check": "eslint '**/*.js'"
1819
},

packages/sparse-ints/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"scripts": {
1313
"build": "exit 0",
1414
"test": "exit 0",
15+
"test:xs": "exit 0",
1516
"lint-fix": "eslint --fix '**/*.js'",
1617
"lint-check": "eslint '**/*.js'"
1718
},

packages/spawner/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"build": "exit 0",
1414
"test": "ava",
1515
"test:nyc": "nyc ava",
16+
"test:xs": "exit 0",
1617
"lint-fix": "eslint --fix '**/*.js'",
1718
"lint-check": "eslint '**/*.js'"
1819
},

packages/stat-logger/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"scripts": {
1313
"build": "exit 0",
1414
"test": "exit 0",
15+
"test:xs": "exit 0",
1516
"lint-fix": "eslint --fix '**/*.js'",
1617
"lint-check": "eslint '**/*.js'"
1718
},

packages/store/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"scripts": {
1313
"build": "exit 0",
1414
"test": "ava",
15+
"test:xs": "exit 0",
1516
"lint-fix": "yarn lint --fix",
1617
"lint-check": "yarn lint",
1718
"lint": "yarn lint:types && yarn lint:eslint",

packages/swing-store-lmdb/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"build": "exit 0",
1414
"test": "ava",
1515
"test:nyc": "nyc ava",
16+
"test:xs": "exit 0",
1617
"lint-fix": "eslint --fix '**/*.js'",
1718
"lint-check": "eslint '**/*.js'"
1819
},

packages/swing-store-simple/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"build": "exit 0",
1414
"test": "ava",
1515
"test:nyc": "nyc ava",
16+
"test:xs": "exit 0",
1617
"lint-fix": "eslint --fix '**/*.js'",
1718
"lint-check": "eslint '**/*.js'"
1819
},

packages/swingset-runner/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"build": "exit 0",
1515
"test": "ava",
1616
"test:nyc": "nyc ava",
17+
"test:xs": "exit 0",
1718
"lint-fix": "eslint --fix '**/*.js'",
1819
"lint-check": "eslint '**/*.js'",
1920
"ci:autobench": "./autobench"

packages/tame-metering/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"scripts": {
1010
"test": "ava",
1111
"test:nyc": "nyc ava",
12+
"test:xs": "exit 0",
1213
"lint-fix": "eslint --fix '**/*.{js,jsx}'",
1314
"lint-check": "eslint '**/*.{js,jsx}'",
1415
"build": "exit 0"

packages/transform-eventual-send/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"scripts": {
1010
"test": "ava",
1111
"test:nyc": "nyc ava",
12+
"test:xs": "exit 0",
1213
"lint-fix": "eslint --fix '**/*.js'",
1314
"lint-check": "eslint '**/*.js'",
1415
"build": "exit 0"

packages/transform-metering/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"scripts": {
1010
"test": "ava",
1111
"test:nyc": "nyc ava",
12+
"test:xs": "exit 0",
1213
"lint-fix": "eslint --fix '**/*.{js,jsx}'",
1314
"lint-check": "eslint '**/*.{js,jsx}'",
1415
"build": "exit 0"

packages/xsnap/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"lint:types": "tsc -p jsconfig.json",
2424
"lint-fix": "eslint --fix 'src/**/*.js' 'lib/**/*.js'",
2525
"lint-check": "yarn lint",
26-
"test": "ava"
26+
"test": "ava",
27+
"test:xs": "exit 0"
2728
},
2829
"dependencies": {
2930
"@agoric/assert": "^0.2.2-dev.0",

packages/zoe/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
},
1212
"scripts": {
1313
"build": "yarn build-zcfBundle",
14-
"test": "yarn test:node && yarn test:xs-unit",
15-
"test:node": "ava --verbose",
14+
"test": "ava --verbose",
1615
"test:nyc": "nyc ava",
16+
"test:xs": "yarn test:xs-unit",
1717
"test:xs-unit": "ava-xs --verbose",
1818
"test:xs-unit-debug": "ava-xs --debug",
1919
"test:xs-worker": "WORKER_TYPE=xs-worker ava",

0 commit comments

Comments
 (0)