diff --git a/scripts/build-wasm-test.sh b/scripts/build-wasm-test.sh index 717df28..515a5be 100755 --- a/scripts/build-wasm-test.sh +++ b/scripts/build-wasm-test.sh @@ -112,11 +112,12 @@ if [ "$CLEAN_BUILD" = "1" ]; then make -f Makefile.wasm clean 2>/dev/null || true fi -# Build (pass DEBUG flag if requested) +# Build (pass DEBUG flag if requested). App links are independent, so honor +# JOBS/PARALLEL_JOBS from env.sh (each emcc link is slow due to Asyncify). if [ "$DEBUG_BUILD" = "1" ]; then - make -f Makefile.wasm DEBUG=1 $MAKE_PORT_ARGS "$MAKE_TARGET" + make -j"${JOBS:-1}" -f Makefile.wasm DEBUG=1 $MAKE_PORT_ARGS "$MAKE_TARGET" else - make -f Makefile.wasm $MAKE_PORT_ARGS "$MAKE_TARGET" + make -j"${JOBS:-1}" -f Makefile.wasm $MAKE_PORT_ARGS "$MAKE_TARGET" fi echo "" diff --git a/tests/baseline-screenshots-dom/03-after-load.png b/tests/baseline-screenshots-dom/03-after-load.png index b974d5b..851fd1c 100644 Binary files a/tests/baseline-screenshots-dom/03-after-load.png and b/tests/baseline-screenshots-dom/03-after-load.png differ diff --git a/tests/baseline-screenshots-dom/04-controls-tab.png b/tests/baseline-screenshots-dom/04-controls-tab.png index 70a5245..80bb0b4 100644 Binary files a/tests/baseline-screenshots-dom/04-controls-tab.png and b/tests/baseline-screenshots-dom/04-controls-tab.png differ diff --git a/tests/baseline-screenshots-dom/05-text-input-tab.png b/tests/baseline-screenshots-dom/05-text-input-tab.png index 6af1a2b..1064524 100644 Binary files a/tests/baseline-screenshots-dom/05-text-input-tab.png and b/tests/baseline-screenshots-dom/05-text-input-tab.png differ diff --git a/tests/baseline-screenshots-dom/dialogs-00-initial.png b/tests/baseline-screenshots-dom/dialogs-00-initial.png index b974d5b..2c7aec9 100644 Binary files a/tests/baseline-screenshots-dom/dialogs-00-initial.png and b/tests/baseline-screenshots-dom/dialogs-00-initial.png differ diff --git a/tests/baseline-screenshots-dom/dialogs-01-tab-selected.png b/tests/baseline-screenshots-dom/dialogs-01-tab-selected.png index 49cfb24..f7bfd00 100644 Binary files a/tests/baseline-screenshots-dom/dialogs-01-tab-selected.png and b/tests/baseline-screenshots-dom/dialogs-01-tab-selected.png differ diff --git a/tests/baseline-screenshots-dom/dialogs-custom-closed.png b/tests/baseline-screenshots-dom/dialogs-custom-closed.png index 155a3be..ddd9745 100644 Binary files a/tests/baseline-screenshots-dom/dialogs-custom-closed.png and b/tests/baseline-screenshots-dom/dialogs-custom-closed.png differ diff --git a/tests/baseline-screenshots-dom/dialogs-custom-open.png b/tests/baseline-screenshots-dom/dialogs-custom-open.png index 3cffd15..78f1d0c 100644 Binary files a/tests/baseline-screenshots-dom/dialogs-custom-open.png and b/tests/baseline-screenshots-dom/dialogs-custom-open.png differ diff --git a/tests/baseline-screenshots-dom/dialogs-full-flow.png b/tests/baseline-screenshots-dom/dialogs-full-flow.png index 9d6bb53..9c2d178 100644 Binary files a/tests/baseline-screenshots-dom/dialogs-full-flow.png and b/tests/baseline-screenshots-dom/dialogs-full-flow.png differ diff --git a/tests/baseline-screenshots-dom/dialogs-msgbox-error-closed.png b/tests/baseline-screenshots-dom/dialogs-msgbox-error-closed.png index bec9b17..09ac131 100644 Binary files a/tests/baseline-screenshots-dom/dialogs-msgbox-error-closed.png and b/tests/baseline-screenshots-dom/dialogs-msgbox-error-closed.png differ diff --git a/tests/baseline-screenshots-dom/dialogs-msgbox-error-open.png b/tests/baseline-screenshots-dom/dialogs-msgbox-error-open.png index b40c71f..00e8a78 100644 Binary files a/tests/baseline-screenshots-dom/dialogs-msgbox-error-open.png and b/tests/baseline-screenshots-dom/dialogs-msgbox-error-open.png differ diff --git a/tests/baseline-screenshots-dom/dialogs-msgbox-info-closed.png b/tests/baseline-screenshots-dom/dialogs-msgbox-info-closed.png index d954983..a76c548 100644 Binary files a/tests/baseline-screenshots-dom/dialogs-msgbox-info-closed.png and b/tests/baseline-screenshots-dom/dialogs-msgbox-info-closed.png differ diff --git a/tests/baseline-screenshots-dom/dialogs-msgbox-info-open.png b/tests/baseline-screenshots-dom/dialogs-msgbox-info-open.png index f0c160d..b868c33 100644 Binary files a/tests/baseline-screenshots-dom/dialogs-msgbox-info-open.png and b/tests/baseline-screenshots-dom/dialogs-msgbox-info-open.png differ diff --git a/tests/baseline-screenshots-dom/dialogs-msgbox-yesno-closed.png b/tests/baseline-screenshots-dom/dialogs-msgbox-yesno-closed.png index 1c6eafe..07dd42f 100644 Binary files a/tests/baseline-screenshots-dom/dialogs-msgbox-yesno-closed.png and b/tests/baseline-screenshots-dom/dialogs-msgbox-yesno-closed.png differ diff --git a/tests/baseline-screenshots-dom/dialogs-msgbox-yesno-open.png b/tests/baseline-screenshots-dom/dialogs-msgbox-yesno-open.png index 756f86d..76f57b0 100644 Binary files a/tests/baseline-screenshots-dom/dialogs-msgbox-yesno-open.png and b/tests/baseline-screenshots-dom/dialogs-msgbox-yesno-open.png differ diff --git a/tests/baseline-screenshots-dom/dialogs-timer-initial.png b/tests/baseline-screenshots-dom/dialogs-timer-initial.png index 49cfb24..5038c30 100644 Binary files a/tests/baseline-screenshots-dom/dialogs-timer-initial.png and b/tests/baseline-screenshots-dom/dialogs-timer-initial.png differ diff --git a/tests/baseline-screenshots-dom/dialogs-timer-multiple.png b/tests/baseline-screenshots-dom/dialogs-timer-multiple.png index cffe462..2ae87ac 100644 Binary files a/tests/baseline-screenshots-dom/dialogs-timer-multiple.png and b/tests/baseline-screenshots-dom/dialogs-timer-multiple.png differ diff --git a/tests/baseline-screenshots-dom/dialogs-timer-running.png b/tests/baseline-screenshots-dom/dialogs-timer-running.png index abb2488..a06eab0 100644 Binary files a/tests/baseline-screenshots-dom/dialogs-timer-running.png and b/tests/baseline-screenshots-dom/dialogs-timer-running.png differ diff --git a/tests/baseline-screenshots-dom/dialogs-timer-started.png b/tests/baseline-screenshots-dom/dialogs-timer-started.png index d067b1d..386d846 100644 Binary files a/tests/baseline-screenshots-dom/dialogs-timer-started.png and b/tests/baseline-screenshots-dom/dialogs-timer-started.png differ diff --git a/tests/baseline-screenshots-dom/dialogs-timer-stopped.png b/tests/baseline-screenshots-dom/dialogs-timer-stopped.png index 750980d..cead589 100644 Binary files a/tests/baseline-screenshots-dom/dialogs-timer-stopped.png and b/tests/baseline-screenshots-dom/dialogs-timer-stopped.png differ diff --git a/tests/baseline-screenshots-dom/fontenum.png b/tests/baseline-screenshots-dom/fontenum.png index f139ace..6d7c54d 100644 Binary files a/tests/baseline-screenshots-dom/fontenum.png and b/tests/baseline-screenshots-dom/fontenum.png differ diff --git a/tests/baseline-screenshots-dom/grid-tab-final.png b/tests/baseline-screenshots-dom/grid-tab-final.png index 48ac981..8b8a5ac 100644 Binary files a/tests/baseline-screenshots-dom/grid-tab-final.png and b/tests/baseline-screenshots-dom/grid-tab-final.png differ diff --git a/tests/baseline-screenshots-dom/infobar-01-loaded.png b/tests/baseline-screenshots-dom/infobar-01-loaded.png index 6c51a27..09914cc 100644 Binary files a/tests/baseline-screenshots-dom/infobar-01-loaded.png and b/tests/baseline-screenshots-dom/infobar-01-loaded.png differ diff --git a/tests/baseline-screenshots-dom/infobar-02-info.png b/tests/baseline-screenshots-dom/infobar-02-info.png index d25b027..557f3d8 100644 Binary files a/tests/baseline-screenshots-dom/infobar-02-info.png and b/tests/baseline-screenshots-dom/infobar-02-info.png differ diff --git a/tests/baseline-screenshots-dom/infobar-03-warning.png b/tests/baseline-screenshots-dom/infobar-03-warning.png index 7a69a97..4d70c0e 100644 Binary files a/tests/baseline-screenshots-dom/infobar-03-warning.png and b/tests/baseline-screenshots-dom/infobar-03-warning.png differ diff --git a/tests/baseline-screenshots-dom/infobar-04-error.png b/tests/baseline-screenshots-dom/infobar-04-error.png index 7afddaf..7faffcf 100644 Binary files a/tests/baseline-screenshots-dom/infobar-04-error.png and b/tests/baseline-screenshots-dom/infobar-04-error.png differ diff --git a/tests/baseline-screenshots-dom/infobar-05-dismiss.png b/tests/baseline-screenshots-dom/infobar-05-dismiss.png index 8418a68..d65fb62 100644 Binary files a/tests/baseline-screenshots-dom/infobar-05-dismiss.png and b/tests/baseline-screenshots-dom/infobar-05-dismiss.png differ diff --git a/tests/baseline-screenshots-dom/printpreview-04-page-setup.png b/tests/baseline-screenshots-dom/printpreview-04-page-setup.png index f979792..5ccc6d8 100644 Binary files a/tests/baseline-screenshots-dom/printpreview-04-page-setup.png and b/tests/baseline-screenshots-dom/printpreview-04-page-setup.png differ diff --git a/tests/baseline-screenshots-dom/searchctrl-01-visible.png b/tests/baseline-screenshots-dom/searchctrl-01-visible.png index 48ac981..fc136ba 100644 Binary files a/tests/baseline-screenshots-dom/searchctrl-01-visible.png and b/tests/baseline-screenshots-dom/searchctrl-01-visible.png differ diff --git a/tests/baseline-screenshots-dom/searchctrl-02-typing.png b/tests/baseline-screenshots-dom/searchctrl-02-typing.png index 517e790..add762b 100644 Binary files a/tests/baseline-screenshots-dom/searchctrl-02-typing.png and b/tests/baseline-screenshots-dom/searchctrl-02-typing.png differ diff --git a/tests/baseline-screenshots-dom/searchctrl-03-after-enter.png b/tests/baseline-screenshots-dom/searchctrl-03-after-enter.png index 517e790..add762b 100644 Binary files a/tests/baseline-screenshots-dom/searchctrl-03-after-enter.png and b/tests/baseline-screenshots-dom/searchctrl-03-after-enter.png differ diff --git a/tests/baseline-screenshots-dom/specialized-01-loaded.png b/tests/baseline-screenshots-dom/specialized-01-loaded.png index fefbf2e..c096bec 100644 Binary files a/tests/baseline-screenshots-dom/specialized-01-loaded.png and b/tests/baseline-screenshots-dom/specialized-01-loaded.png differ diff --git a/tests/baseline-screenshots-dom/specialized-02-treebook-initial.png b/tests/baseline-screenshots-dom/specialized-02-treebook-initial.png index fefbf2e..c096bec 100644 Binary files a/tests/baseline-screenshots-dom/specialized-02-treebook-initial.png and b/tests/baseline-screenshots-dom/specialized-02-treebook-initial.png differ diff --git a/tests/baseline-screenshots-dom/specialized-03-treebook-subpage.png b/tests/baseline-screenshots-dom/specialized-03-treebook-subpage.png index 7233afe..9d8a55b 100644 Binary files a/tests/baseline-screenshots-dom/specialized-03-treebook-subpage.png and b/tests/baseline-screenshots-dom/specialized-03-treebook-subpage.png differ diff --git a/tests/baseline-screenshots-dom/specialized-04-treebook-expand.png b/tests/baseline-screenshots-dom/specialized-04-treebook-expand.png index 41fa468..626233e 100644 Binary files a/tests/baseline-screenshots-dom/specialized-04-treebook-expand.png and b/tests/baseline-screenshots-dom/specialized-04-treebook-expand.png differ diff --git a/tests/baseline-screenshots-dom/specialized-05-bitmapcombo-dropdown.png b/tests/baseline-screenshots-dom/specialized-05-bitmapcombo-dropdown.png index 7204fc9..71a6e27 100644 Binary files a/tests/baseline-screenshots-dom/specialized-05-bitmapcombo-dropdown.png and b/tests/baseline-screenshots-dom/specialized-05-bitmapcombo-dropdown.png differ diff --git a/tests/baseline-screenshots-dom/specialized-06-bitmapcombo-select.png b/tests/baseline-screenshots-dom/specialized-06-bitmapcombo-select.png index d682052..e0625f7 100644 Binary files a/tests/baseline-screenshots-dom/specialized-06-bitmapcombo-select.png and b/tests/baseline-screenshots-dom/specialized-06-bitmapcombo-select.png differ diff --git a/tests/baseline-screenshots-dom/specialized-07-rearrange-list.png b/tests/baseline-screenshots-dom/specialized-07-rearrange-list.png index fefbf2e..c096bec 100644 Binary files a/tests/baseline-screenshots-dom/specialized-07-rearrange-list.png and b/tests/baseline-screenshots-dom/specialized-07-rearrange-list.png differ diff --git a/tests/baseline-screenshots-dom/specialized-08-get-order.png b/tests/baseline-screenshots-dom/specialized-08-get-order.png index ed02279..e7fa749 100644 Binary files a/tests/baseline-screenshots-dom/specialized-08-get-order.png and b/tests/baseline-screenshots-dom/specialized-08-get-order.png differ diff --git a/tests/baseline-screenshots-dom/spinctrl-01-visible.png b/tests/baseline-screenshots-dom/spinctrl-01-visible.png index 48ac981..675aeef 100644 Binary files a/tests/baseline-screenshots-dom/spinctrl-01-visible.png and b/tests/baseline-screenshots-dom/spinctrl-01-visible.png differ diff --git a/tests/baseline-screenshots-dom/wxgrid-01-tab.png b/tests/baseline-screenshots-dom/wxgrid-01-tab.png index 48ac981..908076f 100644 Binary files a/tests/baseline-screenshots-dom/wxgrid-01-tab.png and b/tests/baseline-screenshots-dom/wxgrid-01-tab.png differ diff --git a/tests/baseline-screenshots-dom/wxgrid-02-selection.png b/tests/baseline-screenshots-dom/wxgrid-02-selection.png index fbef87e..ce57c8c 100644 Binary files a/tests/baseline-screenshots-dom/wxgrid-02-selection.png and b/tests/baseline-screenshots-dom/wxgrid-02-selection.png differ diff --git a/tests/baseline-screenshots-dom/wxgrid-03-editing.png b/tests/baseline-screenshots-dom/wxgrid-03-editing.png index 029d8e1..3083033 100644 Binary files a/tests/baseline-screenshots-dom/wxgrid-03-editing.png and b/tests/baseline-screenshots-dom/wxgrid-03-editing.png differ diff --git a/wxwidgets b/wxwidgets index 9d720ae..b0db8a7 160000 --- a/wxwidgets +++ b/wxwidgets @@ -1 +1 @@ -Subproject commit 9d720aed153ddd079a82d98699e4be524df18bad +Subproject commit b0db8a7b24a68fb5c2650b956340c1c79e5ec420