Skip to content

Remove RWC runner and related infrastructure #55187

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

Merged
merged 1 commit into from
Aug 7, 2023
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
21 changes: 1 addition & 20 deletions Herebyfile.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import util from "util";
import { localizationDirectories } from "./scripts/build/localization.mjs";
import cmdLineOptions from "./scripts/build/options.mjs";
import { buildProject, cleanProject, watchProject } from "./scripts/build/projects.mjs";
import { localBaseline, localRwcBaseline, refBaseline, refRwcBaseline, runConsoleTests } from "./scripts/build/tests.mjs";
import { localBaseline, refBaseline, runConsoleTests } from "./scripts/build/tests.mjs";
import { Debouncer, Deferred, exec, getDiffTool, memoize, needsUpdate, readJson } from "./scripts/build/utils.mjs";

const glob = util.promisify(_glob);
Expand Down Expand Up @@ -740,12 +740,6 @@ export const diff = task({
run: () => exec(getDiffTool(), [refBaseline, localBaseline], { ignoreExitCode: true, waitForExit: false }),
});

export const diffRwc = task({
name: "diff-rwc",
description: "Diffs the RWC baselines using the diff tool specified by the 'DIFF' environment variable",
run: () => exec(getDiffTool(), [refRwcBaseline, localRwcBaseline], { ignoreExitCode: true, waitForExit: false }),
});

/**
* @param {string} localBaseline Path to the local copy of the baselines
* @param {string} refBaseline Path to the reference copy of the baselines
Expand Down Expand Up @@ -780,12 +774,6 @@ export const baselineAccept = task({
run: baselineAcceptTask(localBaseline, refBaseline),
});

export const baselineAcceptRwc = task({
name: "baseline-accept-rwc",
description: "Makes the most recent rwc test results the new baseline, overwriting the old baseline",
run: baselineAcceptTask(localRwcBaseline, refRwcBaseline),
});

// TODO(rbuckton): Determine if we still need this task. Depending on a relative
// path here seems like a bad idea.
export const updateSublime = task({
Expand All @@ -799,13 +787,6 @@ export const updateSublime = task({
}
});

// TODO(rbuckton): Should the path to DefinitelyTyped be configurable via an environment variable?
export const importDefinitelyTypedTests = task({
name: "importDefinitelyTypedTests",
description: "Runs the importDefinitelyTypedTests script to copy DT's tests to the TS-internal RWC tests",
run: () => exec(process.execPath, ["scripts/importDefinitelyTypedTests.mjs", "./", "../DefinitelyTyped"]),
});


export const produceLKG = task({
name: "LKG",
Expand Down
11 changes: 2 additions & 9 deletions scripts/build/tests.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import { exec, ExecError } from "./utils.mjs";
const mochaJs = path.resolve(findUpRoot(), "node_modules", "mocha", "bin", "_mocha");
export const localBaseline = "tests/baselines/local/";
export const refBaseline = "tests/baselines/reference/";
export const localRwcBaseline = "internal/baselines/rwc/local";
export const refRwcBaseline = "internal/baselines/rwc/reference";
export const coverageDir = "coverage";

/**
Expand All @@ -25,7 +23,7 @@ export const coverageDir = "coverage";
* @param {boolean} [options.watching]
*/
export async function runConsoleTests(runJs, defaultReporter, runInParallel, options = {}) {
let testTimeout = cmdLineOptions.timeout;
const testTimeout = cmdLineOptions.timeout;
const tests = cmdLineOptions.tests;
const inspect = cmdLineOptions.break || cmdLineOptions.inspect;
const runners = cmdLineOptions.runners;
Expand Down Expand Up @@ -67,10 +65,6 @@ export async function runConsoleTests(runJs, defaultReporter, runInParallel, opt
workerCount = cmdLineOptions.workers;
}

if (tests && tests.toLocaleLowerCase() === "rwc") {
testTimeout = 400000;
}

if (options.watching) {
console.log(chalk.yellowBright(`[watch] running tests...`));
}
Expand Down Expand Up @@ -174,8 +168,7 @@ export async function runConsoleTests(runJs, defaultReporter, runInParallel, opt
}

export async function cleanTestDirs() {
await del([localBaseline, localRwcBaseline]);
await fs.promises.mkdir(localRwcBaseline, { recursive: true });
await del([localBaseline]);
await fs.promises.mkdir(localBaseline, { recursive: true });
}

Expand Down
178 changes: 0 additions & 178 deletions scripts/importDefinitelyTypedTests.mjs

This file was deleted.

2 changes: 1 addition & 1 deletion src/harness/runnerbase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
} from "./_namespaces/Harness";
import * as ts from "./_namespaces/ts";

export type TestRunnerKind = CompilerTestKind | FourslashTestKind | "project" | "rwc";
export type TestRunnerKind = CompilerTestKind | FourslashTestKind | "project";
export type CompilerTestKind = "conformance" | "compiler";
export type FourslashTestKind = "fourslash" | "fourslash-shims" | "fourslash-shims-pp" | "fourslash-server";

Expand Down
4 changes: 0 additions & 4 deletions src/loggedIO/_namespaces/Harness.ts

This file was deleted.

3 changes: 0 additions & 3 deletions src/loggedIO/_namespaces/Playback.ts

This file was deleted.

7 changes: 0 additions & 7 deletions src/loggedIO/_namespaces/ts.server.ts

This file was deleted.

10 changes: 0 additions & 10 deletions src/loggedIO/_namespaces/ts.ts

This file was deleted.

Loading