refactor: collapse dual-mode plumbing — the DOM port is the only WASM build
The canvas (wxUniversal) mode is gone (wxwidgets submodule); remove every piece of side-by-side plumbing so there is exactly one build and one test flow: - scripts/build-wxuniversal-wasm.sh -> scripts/build-wx-wasm.sh; no --dom/--enable-universal; builds into build-wasm/wxwidgets - build-wasm-test.sh: no DOM_BUILD / apps-dom rsync mirror / PORT=dom; apps build straight into tests/apps (Makefile.wasm PORT conditionals collapsed; wx.js + wx-dom.js always pre-js) - docker/build.sh, build-kicad-target.sh, env.sh: WX_PORT / -dom / -universal suffixes removed; kicad builds to kicad-<app>, outputs to output/; wx.js/wx-dom.js copied from the real source path (/workspace/wxwidgets/build/wasm — the old build-wasm path never existed and silently failed) - setup-kicad-wasm.sh: single target dir; the perl wx-dom.js injection is gone — the 7 checked-in kicad pages now reference wx-dom.js directly - playwright configs serve apps/; fixtures drop the test-results/dom and logs/wxwidgets/dom namespacing; boot.spec asserts wxDomPort unconditionally; pcbnew.spec uses one reference image; appearance.spec assertions unconditional - compare/update-baseline-screenshots.sh: --port removed - tests/gal-regression/wasm/Makefile: links build-wasm/wxwidgets and carries wx-dom.js as a second pre-js — the gal-webgl suite (30 specs) now actually builds and runs here (it needed host-side boost+glm via scripts/deps; the bundle had been missing, timing the whole spec out) - tests: clickCanvas() dispatches via page.mouse (DOM widgets legitimately cover the canvas; locator actionability refused the click); the comprehensive spec drives wxChoice through its native <select> (browser-owned popup cannot be coordinate-clicked) - docs: README/CLAUDE.md/build.md script names and dirs; features/wx-dom-port README reframed (DOM is THE port), visual-notes bugs 26-28; FindwxWidgets.cmake config label drops 'wasmuniv' - wxwidgets submodule -> 9dbacc9448 (DOM-only port, fork diff shrunk) Gate: full wx e2e suite 292 passed / 1 skipped / 0 failed — first run ever with the gal-webgl specs green (28 scenarios + load + sequential). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
parent
2c1b0d409b
commit
7dc1bf27e0
32 changed files with 199 additions and 335 deletions
|
|
@ -2,31 +2,10 @@ import { test as base } from '@playwright/test';
|
|||
import * as path from 'path';
|
||||
import { setupTestLogger, writeTestLogs, TestLogger, MAIN_CANVAS, waitForApp, tryLoadApp, getCanvasBox, WXWIDGETS_LOGS_DIR, getTestFileName } from './test-utils';
|
||||
|
||||
// WX_PORT=dom runs the same specs against the DOM-port bundles; screenshots
|
||||
// and logs are namespaced into a dom/ subdirectory so the canvas artifacts
|
||||
// stay untouched (baselines: tests/baseline-screenshots-dom/).
|
||||
const IS_DOM_PORT = process.env.WX_PORT === 'dom';
|
||||
|
||||
// Extend base test with automatic logging
|
||||
export const test = base.extend<{
|
||||
testLogger: TestLogger;
|
||||
}>({
|
||||
page: async ({ page }, use) => {
|
||||
if (IS_DOM_PORT) {
|
||||
const origScreenshot = page.screenshot.bind(page);
|
||||
page.screenshot = ((options?: Parameters<typeof origScreenshot>[0]) => {
|
||||
if (options?.path) {
|
||||
const dir = path.dirname(options.path);
|
||||
// Specs write to test-results/<name>.png; redirect to test-results/dom/.
|
||||
if (path.basename(dir) === 'test-results') {
|
||||
options = { ...options, path: path.join(dir, 'dom', path.basename(options.path)) };
|
||||
}
|
||||
}
|
||||
return origScreenshot(options);
|
||||
}) as typeof page.screenshot;
|
||||
}
|
||||
await use(page);
|
||||
},
|
||||
testLogger: async ({ page }, use, testInfo) => {
|
||||
// Build test name from describe block + test title
|
||||
const testName = testInfo.titlePath.join(' - ');
|
||||
|
|
@ -35,11 +14,9 @@ export const test = base.extend<{
|
|||
|
||||
await use(logger);
|
||||
|
||||
// Write logs to wxwidgets/<test-file>/ directory (wxwidgets/dom/<test-file>/ for the DOM port)
|
||||
// Write logs to wxwidgets/<test-file>/ directory
|
||||
const testFileName = getTestFileName(testInfo.file);
|
||||
const logsDir = IS_DOM_PORT
|
||||
? path.join(WXWIDGETS_LOGS_DIR, 'dom', testFileName)
|
||||
: path.join(WXWIDGETS_LOGS_DIR, testFileName);
|
||||
const logsDir = path.join(WXWIDGETS_LOGS_DIR, testFileName);
|
||||
writeTestLogs(testName, logger, logsDir);
|
||||
logger.cleanup();
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in a new issue