![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 136.0.7076.0 * chore: bump chromium in DEPS to 136.0.7077.0 * 6368856: Migrate absl variant.h and utility.h in content (part 2/2) | https://chromium-review.googlesource.com/c/chromium/src/+/6368856 * 6356528: Clean up LegacyRenderWidgetHostHWND code | https://chromium-review.googlesource.com/c/chromium/src/+/6356528 * chore: export patches * 6339113: [Viewport Segments] Add CDP commands to override Viewport Segments without overriding other device properties. | https://chromium-review.googlesource.com/c/chromium/src/+/6339113 * 6352169: [DevTools][MultiInstance] Support new tab in another window on Android | https://chromium-review.googlesource.com/c/chromium/src/+/6352169 * 6368856: Migrate absl variant.h and utility.h in content (part 2/2) | https://chromium-review.googlesource.com/c/chromium/src/+/6368856 * 6360858:Clickiness: Wire response from URLLoader to DB, add e2e tests| https://chromium-review.googlesource.com/c/chromium/src/+/6360858 * chore: bump chromium in DEPS to 136.0.7079.0 * chore: export patches * chore: bump chromium in DEPS to 136.0.7081.0 * chore: export patches * chore: bump chromium in DEPS to 136.0.7083.0 * 6361987: Remove double-declaration with gfx::NativeView and gfx::NativeWindow | https://chromium-review.googlesource.com/c/chromium/src/+/6361987 * chore: export patches * chore: bump chromium in DEPS to 136.0.7087.0 * chore: export patches * fix: include node patch for missing AtomicsWaitEvent https://chromium-review.googlesource.com/c/chromium/src/+/6385540 * build: add depot_tools python to path * fix: cppgc init and unregistering v8 isolate https://chromium-review.googlesource.com/c/v8/v8/+/6333562 CppGc is now initialized earlier so Node can skip reinitializing it. Additionally, gin::IsolateHandle was attempting to destruct an already destructed v8::Isolate upon electron::JavaScriptEnvironment destruction. By removing the call to NodePlatform::UnregisterIsolate, this fixes the crash on app shutdown. * fix: unregister isolate after destruction See code comment. * chore: bump chromium in DEPS to 136.0.7095.0 * chore: sync patches * fix: add script_parsing::ContentScriptType parameter https://chromium-review.googlesource.com/c/chromium/src/+/6298395 * fix: migrate content::BrowserAccessibilityState methods https://chromium-review.googlesource.com/c/chromium/src/+/6401437 https://chromium-review.googlesource.com/c/chromium/src/+/6383275 * feat: enableHappyEyeballs option for host resolver https://chromium-review.googlesource.com/c/chromium/src/+/6332599 * fix: add new cookie exclusion reason https://chromium-review.googlesource.com/c/chromium/src/+/6343479 * fix: add new url loader method https://chromium-review.googlesource.com/c/chromium/src/+/6337340 * fix: add new cppgc header file for electron_node headers https://chromium-review.googlesource.com/c/v8/v8/+/6348644 * fix: disable CREL on Linux ARM64 https://chromium-review.googlesource.com/q/I3a62f02f564f07be63173b0773b4ecaffbe939b9 * fixup! fix: add new cppgc header file for electron_node headers https://chromium-review.googlesource.com/c/v8/v8/+/6348644 * chore: update corner smoothing patch * fixup! chore: update corner smoothing patch * chore: disable NAN weak tests These two tests are incompatible with a V8 change that disallows running JS code from a weak finalizer callback. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/4733273 * test: fix task starvation in node test A V8 change makes these contexts get collected in a task that is posted and run asynchronously. The tests were synchronously GC'ing in an infinite loop, preventing the task loop from running the task that would GC these contexts. This change should be upstreamed in some way. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/4733273 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: alice <alice@makenotion.com> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: clavin <clavin@electronjs.org>
162 lines
5.2 KiB
JavaScript
162 lines
5.2 KiB
JavaScript
const minimist = require('minimist');
|
|
|
|
const cp = require('node:child_process');
|
|
const fs = require('node:fs');
|
|
const path = require('node:path');
|
|
|
|
const BASE = path.resolve(__dirname, '../..');
|
|
const NAN_DIR = path.resolve(BASE, 'third_party', 'nan');
|
|
const NPX_CMD = process.platform === 'win32' ? 'npx.cmd' : 'npx';
|
|
|
|
const utils = require('./lib/utils');
|
|
const { YARN_VERSION } = require('./yarn');
|
|
|
|
if (!require.main) {
|
|
throw new Error('Must call the nan spec runner directly');
|
|
}
|
|
|
|
const args = minimist(process.argv.slice(2), {
|
|
string: ['only']
|
|
});
|
|
|
|
const getNodeGypVersion = () => {
|
|
const nanPackageJSONPath = path.join(NAN_DIR, 'package.json');
|
|
const nanPackageJSON = JSON.parse(fs.readFileSync(nanPackageJSONPath, 'utf8'));
|
|
const { devDependencies } = nanPackageJSON;
|
|
const nodeGypVersion = devDependencies['node-gyp'];
|
|
return nodeGypVersion || 'latest';
|
|
};
|
|
|
|
async function main () {
|
|
const outDir = utils.getOutDir({ shouldLog: true });
|
|
const nodeDir = path.resolve(BASE, 'out', outDir, 'gen', 'node_headers');
|
|
const env = {
|
|
npm_config_msvs_version: '2022',
|
|
...process.env,
|
|
npm_config_nodedir: nodeDir,
|
|
npm_config_arch: process.env.NPM_CONFIG_ARCH,
|
|
npm_config_yes: 'true'
|
|
};
|
|
|
|
const clangDir = path.resolve(BASE, 'third_party', 'llvm-build', 'Release+Asserts', 'bin');
|
|
const cc = path.resolve(clangDir, 'clang');
|
|
const cxx = path.resolve(clangDir, 'clang++');
|
|
const ld = path.resolve(clangDir, 'lld');
|
|
|
|
const platformFlags = [];
|
|
if (process.platform === 'darwin') {
|
|
const sdkPath = path.resolve(BASE, 'out', outDir, 'sdk', 'xcode_links');
|
|
const sdks = (await fs.promises.readdir(sdkPath)).filter(fileName => fileName.endsWith('.sdk'));
|
|
const sdkToUse = sdks[0];
|
|
if (!sdkToUse) {
|
|
console.error('Could not find an SDK to use for the NAN tests');
|
|
process.exit(1);
|
|
}
|
|
|
|
if (sdks.length) {
|
|
console.warn(`Multiple SDKs found in the xcode_links directory - using ${sdkToUse}`);
|
|
}
|
|
|
|
platformFlags.push(
|
|
`-isysroot ${path.resolve(sdkPath, sdkToUse)}`
|
|
);
|
|
}
|
|
|
|
// TODO(ckerr) this is cribbed from read obj/electron/electron_app.ninja.
|
|
// Maybe it would be better to have this script literally open up that
|
|
// file and pull cflags_cc from it instead of using bespoke code here?
|
|
// I think it's unlikely to work; but if it does, it would be more futureproof
|
|
const cxxflags = [
|
|
'-std=c++20',
|
|
'-Wno-trigraphs',
|
|
'-fno-exceptions',
|
|
'-fno-rtti',
|
|
'-nostdinc++',
|
|
`-isystem "${path.resolve(BASE, 'buildtools', 'third_party', 'libc++')}"`,
|
|
`-isystem "${path.resolve(BASE, 'third_party', 'libc++', 'src', 'include')}"`,
|
|
`-isystem "${path.resolve(BASE, 'third_party', 'libc++abi', 'src', 'include')}"`,
|
|
' -fvisibility-inlines-hidden',
|
|
'-fPIC',
|
|
'-D_LIBCPP_ABI_NAMESPACE=Cr',
|
|
'-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE',
|
|
...platformFlags
|
|
].join(' ');
|
|
|
|
const ldflags = [
|
|
'-stdlib=libc++',
|
|
'-fuse-ld=lld',
|
|
`-L"${path.resolve(BASE, 'out', outDir, 'obj', 'buildtools', 'third_party', 'libc++abi')}"`,
|
|
`-L"${path.resolve(BASE, 'out', outDir, 'obj', 'buildtools', 'third_party', 'libc++')}"`,
|
|
'-lc++abi',
|
|
...platformFlags
|
|
].join(' ');
|
|
|
|
if (process.platform !== 'win32') {
|
|
env.CC = cc;
|
|
env.CFLAGS = cxxflags;
|
|
env.CXX = cxx;
|
|
env.LD = ld;
|
|
env.CXXFLAGS = cxxflags;
|
|
env.LDFLAGS = ldflags;
|
|
}
|
|
|
|
const nodeGypVersion = getNodeGypVersion();
|
|
const { status: buildStatus, signal } = cp.spawnSync(NPX_CMD, [`node-gyp@${nodeGypVersion}`, 'rebuild', '--verbose', '--directory', 'test', '-j', 'max'], {
|
|
env,
|
|
cwd: NAN_DIR,
|
|
stdio: 'inherit',
|
|
shell: process.platform === 'win32'
|
|
});
|
|
|
|
if (buildStatus !== 0 || signal != null) {
|
|
console.error('Failed to build nan test modules');
|
|
return process.exit(buildStatus !== 0 ? buildStatus : signal);
|
|
}
|
|
|
|
const { status: installStatus } = cp.spawnSync(NPX_CMD, [`yarn@${YARN_VERSION}`, 'install'], {
|
|
env,
|
|
cwd: NAN_DIR,
|
|
stdio: 'inherit',
|
|
shell: process.platform === 'win32'
|
|
});
|
|
|
|
if (installStatus !== 0 || signal != null) {
|
|
console.error('Failed to install nan node_modules');
|
|
return process.exit(installStatus !== 0 ? installStatus : signal);
|
|
}
|
|
|
|
const onlyTests = args.only && args.only.split(',');
|
|
|
|
const DISABLED_TESTS = new Set([
|
|
'nannew-test.js',
|
|
'buffer-test.js',
|
|
// we can't patch this test because it uses CRLF line endings
|
|
'methodswithdata-test.js',
|
|
// these two are incompatible with crrev.com/c/4733273
|
|
'weak-test.js',
|
|
'weak2-test.js'
|
|
]);
|
|
const testsToRun = fs.readdirSync(path.resolve(NAN_DIR, 'test', 'js'))
|
|
.filter(test => !DISABLED_TESTS.has(test))
|
|
.filter(test => {
|
|
return !onlyTests || onlyTests.includes(test) || onlyTests.includes(test.replace('.js', '')) || onlyTests.includes(test.replace('-test.js', ''));
|
|
})
|
|
.map(test => `test/js/${test}`);
|
|
|
|
const testChild = cp.spawn(utils.getAbsoluteElectronExec(), ['node_modules/.bin/tap', ...testsToRun], {
|
|
env: {
|
|
...process.env,
|
|
ELECTRON_RUN_AS_NODE: 'true'
|
|
},
|
|
cwd: NAN_DIR,
|
|
stdio: 'inherit'
|
|
});
|
|
testChild.on('exit', (testCode) => {
|
|
process.exit(testCode);
|
|
});
|
|
}
|
|
|
|
main().catch((err) => {
|
|
console.error('An unhandled error occurred in the nan spec runner', err);
|
|
process.exit(1);
|
|
});
|