Skip to content
This repository has been archived by the owner on Feb 12, 2022. It is now read-only.

Do full joins #2402

Closed
wants to merge 1 commit into from
Closed
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
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ jobs:
yarn test-react
yarn test-sourcemaps
yarn test-std-in
yarn test-residual
yarn test-test262 --expectedCounts 11944,5641,0 --statusFile ~/artifacts/test262-status.txt --timeout 120 --cpuScale 0.25 --verbose
#yarn test-test262-new --statusFile ~/artifacts/test262-new-status.txt --timeout 120 --verbose
- store_artifacts:
Expand Down
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
"lint": "eslint src scripts",
"flow": "flow",
"flow-ci": "flow version; flow check",
"test-residual": "babel-node scripts/test-residual.js",
"test-residual-with-coverage": "./node_modules/.bin/istanbul cover ./lib/test-residual.js --dir coverage.residual && ./node_modules/.bin/remap-istanbul -i coverage.residual/coverage.json -o coverage-sourcemapped.residual -t html",
"test-serializer": "babel-node --stack_trace_limit=200 --stack_size=10000 scripts/test-runner.js",
"test-serializer-single": "yarn test-serializer --debugNames --verbose --fast --filter",
"test-serializer-with-coverage": "./node_modules/.bin/istanbul cover ./lib/test-error-handler.js --dir coverage.error && ./node_modules/.bin/istanbul cover ./lib/test-runner.js && ./node_modules/.bin/remap-istanbul -i coverage.error/coverage.json -i coverage/coverage.json -o coverage-sourcemapped -t html",
Expand All @@ -47,7 +45,7 @@
"test-std-in": "bash < scripts/test-std-in.sh",
"test-react": "jest",
"test-react-fast": "SKIP_REACT_JSX_TESTS=true jest",
"test": "yarn test-residual && yarn test-serializer && yarn test-sourcemaps && yarn test-error-handler && yarn test-std-in && yarn test-test262 && yarn test-internal && yarn test-internal-react && yarn test-react",
"test": "yarn test-serializer && yarn test-sourcemaps && yarn test-error-handler && yarn test-std-in && yarn test-test262 && yarn test-internal && yarn test-internal-react && yarn test-react",
"test-coverage-most": "./node_modules/.bin/istanbul --stack_size=10000 --max_old_space_size=16384 cover ./lib/multi-runner.js --dir coverage.most && ./node_modules/.bin/remap-istanbul -i coverage.most/coverage.json -o coverage-sourcemapped -t html",
"test-all-coverage": "./node_modules/.bin/istanbul --stack_size=10000 --max_old_space_size=16384 cover ./lib/multi-runner.js --dir coverage.most && ./node_modules/.bin/istanbul --stack_size=10000 --max_old_space_size=16384 cover ./lib/test262-runner.js --timeout 50 --singleThreaded && ./node_modules/.bin/remap-istanbul -i coverage/coverage.json -i coverage.most/coverage.json -o coverage-sourcemapped -t html",
"repl": "node lib/repl-cli.js",
Expand Down
4 changes: 1 addition & 3 deletions scripts/multi-runner.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
*/

/* @flow */
// This file just runs the 4 test runners in one file for coverage
require("./test-residual.js");

// This file just runs the 3 test runners in one file for coverage
require("./test-runner.js");

require("./generate-sourcemaps-test.js");
Expand Down
2 changes: 0 additions & 2 deletions scripts/test-error-handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ function runTest(name: string, code: string): boolean {
console.log(chalk.inverse(name));

let recover = code.includes("// recover-from-errors");
let delayUnsupportedRequires = code.includes("// delay unsupported requires");
let compatibility = code.includes("// jsc") ? "jsc-600-1-4-17" : undefined;

let expectedErrors = code.match(/\/\/\s*expected errors:\s*(.*)/);
Expand All @@ -68,7 +67,6 @@ function runTest(name: string, code: string): boolean {
try {
let options = {
internalDebug: false,
delayUnsupportedRequires,
mathRandomSeed: "0",
errorHandler: errorHandler.bind(null, recover ? "Recover" : "Fail", errors),
serialize: true,
Expand Down
1 change: 0 additions & 1 deletion scripts/test-internal.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ function runTest(name: string, code: string): boolean {
let options = {
internalDebug: true,
compatibility: "jsc-600-1-4-17",
delayUnsupportedRequires: true,
accelerateUnsupportedRequires: true,
mathRandomSeed: "0",
errorHandler,
Expand Down
262 changes: 0 additions & 262 deletions scripts/test-residual.js

This file was deleted.

15 changes: 5 additions & 10 deletions scripts/test-runner.js
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ function verifyFunctionOrderings(code: string): boolean {
return true;
}

function unescapleUniqueSuffix(code: string, uniqueSuffix?: string) {
function unescapeUniqueSuffix(code: string, uniqueSuffix?: string) {
return uniqueSuffix != null ? code.replace(new RegExp(uniqueSuffix, "g"), "") : code;
}

Expand Down Expand Up @@ -341,7 +341,6 @@ function runTest(name, code, options: PrepackOptions, args) {
if (!args.fast && args.filter === "") console.log(chalk.inverse(name) + " " + JSON.stringify(options));
let compatibility = code.includes("// jsc") ? "jsc-600-1-4-17" : undefined;
let initializeMoreModules = code.includes("// initialize more modules");
let delayUnsupportedRequires = code.includes("// delay unsupported requires");
if (args.verbose || code.includes("// inline expressions")) options.inlineExpressions = true;
options.invariantLevel = code.includes("// omit invariants") || args.verbose ? 0 : 99;
if (code.includes("// emit concrete model")) options.emitConcreteModel = true;
Expand All @@ -354,11 +353,11 @@ function runTest(name, code, options: PrepackOptions, args) {
let compileJSXWithBabel = code.includes("// babel:jsx");
let functionCloneCountMatch = code.match(/\/\/ serialized function clone count: (\d+)/);
options = ((Object.assign({}, options, {
abstractValueImpliesMax: 2000,
compatibility,
debugNames: args.debugNames,
debugScopes: args.debugScopes,
initializeMoreModules,
delayUnsupportedRequires,
errorHandler: diag => "Fail",
internalDebug: true,
serialize: true,
Expand All @@ -377,7 +376,6 @@ function runTest(name, code, options: PrepackOptions, args) {
initializeGlobals(realm);
let serializerOptions = {
initializeMoreModules,
delayUnsupportedRequires,
internalDebug: true,
lazyObjectsRuntime: options.lazyObjectsRuntime,
};
Expand Down Expand Up @@ -455,7 +453,6 @@ function runTest(name, code, options: PrepackOptions, args) {
addedCode = code.substring(i + injectAtRuntime.length, code.indexOf("\n", i));
options.residual = false;
}
if (delayUnsupportedRequires) options.residual = false;
if (args.es5) {
code = transformWithBabel(code, [], [["@babel/env", { forceAllTransforms: true, modules: false }]]);
}
Expand Down Expand Up @@ -586,7 +583,7 @@ function runTest(name, code, options: PrepackOptions, args) {
codeToRun = augmentCodeWithLazyObjectSupport(codeToRun, args.lazyObjectsRuntime);
}
if (args.verbose) console.log(codeToRun);
codeIterations.push(unescapleUniqueSuffix(codeToRun, options.uniqueSuffix));
codeIterations.push(unescapeUniqueSuffix(codeToRun, options.uniqueSuffix));
if (args.es5) {
codeToRun = transformWithBabel(
codeToRun,
Expand Down Expand Up @@ -636,9 +633,7 @@ function runTest(name, code, options: PrepackOptions, args) {
}
if (singleIterationOnly) return Promise.reject({ type: "RETURN", value: true });
if (
unescapleUniqueSuffix(oldCode, oldUniqueSuffix) ===
unescapleUniqueSuffix(newCode, newUniqueSuffix) ||
delayUnsupportedRequires
unescapeUniqueSuffix(oldCode, oldUniqueSuffix) === unescapeUniqueSuffix(newCode, newUniqueSuffix)
) {
// The generated code reached a fixed point!
return Promise.reject({ type: "RETURN", value: true });
Expand Down Expand Up @@ -918,7 +913,7 @@ function argsParse(): ProgramArgs {
es5: false, // if true test marked as es6 only are not run
filter: "",
outOfProcessRuntime: "", // if set, assumed to be a JS runtime and is used
// to run tests. If not a seperate node context used.
// to run tests. If not a separate node context used.
lazyObjectsRuntime: LAZY_OBJECTS_RUNTIME_NAME,
noLazySupport: false,
fast: false,
Expand Down
Loading