Merge branch 'main' into 2025-10-30_more_ubuntu

camillobruni · camillobruni · commit f4e549d7789b · 2025-10-30T15:25:43.000+01:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,19 +10,24 @@ on:
     workflow_dispatch:
 
 jobs:
-    test-macos:
-        name: Test macOS
+    browser:
+        name: Test Browser
         runs-on: macos-latest
         env:
             GITHUB_ACTIONS_OUTPUT: ""
         strategy:
             fail-fast: false
             matrix:
-                browser: [safari]
+                browser: [chrome, firefox, safari]
+                suite: [default, disabled, main]
         steps:
             - name: Extract Week Number
               run: echo "WEEK_NUMBER=$(date +%W)" >> $GITHUB_ENV
 
+            - name: Install Firefox
+              if: ${{ matrix.browser == 'firefox' }}
+              run: brew install --cask firefox
+
             - name: Checkout Branch
               uses: actions/checkout@v5
 
@@ -35,26 +40,20 @@ jobs:
             - name: Install Node Packages
               run: npm ci
 
-            - name: Cache jsvu Binaries 
-              uses: actions/cache@v4
-              with:
-                path: ~/.jsvu
-                key: ${{ runner.os }}-jsvu-${{ matrix.browser }}-week-${{ env.WEEK_NUMBER }}
-
             - name: Run Tests
               run: |
                   echo "Running in $BROWSER"
-                  npm run test:${{ matrix.browser }}
-
-    test-linux:
-        name: Test Linux
+                  npm run test:${{ matrix.browser }} -- ${{ matrix.suite }}
+    shell:
+        name: Test Shell
         runs-on: ubuntu-latest
         env:
             GITHUB_ACTIONS_OUTPUT: ""
         strategy:
             fail-fast: false
             matrix:
-                browser: [chrome, firefox, jsc, spidermonkey, v8]
+                shell: [jsc, spidermonkey, v8]
+                suite: [default, disabled, main]
         steps:
             - name: Extract Week Number
               run: echo "WEEK_NUMBER=$(date +%W)" >> $GITHUB_ENV
@@ -71,19 +70,18 @@ jobs:
             - name: Install Node Packages
               run: npm ci
 
-            - name: Cache jsvu Binaries
+            - name: Cache jsvu Binaries 
               uses: actions/cache@v4
               with:
                 path: ~/.jsvu
-                key: ${{ runner.os }}-jsvu-${{ matrix.browser }}-week-${{ env.WEEK_NUMBER }}
+                key: ${{ runner.os }}-jsvu-${{ matrix.shell }}-week-${{ env.WEEK_NUMBER }}
 
             - name: Run Tests
               run: |
                   echo "Running in $BROWSER"
-                  npm run test:${{ matrix.browser }}
-
+                  npm run test:${{ matrix.shell }} -- ${{ matrix.suite }}
     build:
-        name: Build
+        name: Test Build 
         runs-on: ubuntu-latest
         steps:
             - name: Checkout Branch
diff --git a/JetStreamDriver.js b/JetStreamDriver.js
@@ -2256,6 +2256,21 @@ let BENCHMARKS = [
         ],
         tags: ["default", "js", "Proxy"],
     }),
+    new AsyncBenchmark({
+        name: "mobx-startup",
+        files: [
+            "./utils/StartupBenchmark.js",
+            "./mobx/benchmark.js",
+        ],
+        preload: {
+            // Debug Sources for nicer profiling.
+            // BUNDLE: "./mobx/dist/bundle.es6.js",
+            BUNDLE: "./mobx/dist/bundle.es6.min.js",
+        },
+        tags: ["default", "js", "mobx", "startup", "es6"],
+        iterations: 30,
+        worstCaseCount: 3,
+    }),
     new AsyncBenchmark({
         name: "jsdom-d3-startup",
         files: [
diff --git a/mobx/benchmark.js b/mobx/benchmark.js
@@ -28,7 +28,7 @@ const EXPECTED_LOG_LENGTH = 6824;
 class Benchmark extends StartupBenchmark {
   lastResult;
 
-  constructor(iterationCount) {
+  constructor({iterationCount}) {
     super({
       iterationCount,
       expectedCacheCommentCount: 464,
diff --git a/tests/helper.mjs b/tests/helper.mjs
@@ -81,7 +81,7 @@ export async function logGroup(name, body) {
 }
 
 
-export function printHelp(message = "", optionDefinitions) {
+export function printHelp(message, optionDefinitions) {
   const usage = commandLineUsage([
       {
           header: "Run all tests",
@@ -91,13 +91,13 @@ export function printHelp(message = "", optionDefinitions) {
           optionList: optionDefinitions,
       },
   ]);
-  if (!message) {
+  if (!message?.length) {
       console.log(usage);
       process.exit(0);
   } else {
       console.error(message);
-      console.error();
-      console.error(usage);
+      console.log();
+      console.log(usage);
       process.exit(1);
   }
 }
diff --git a/tests/run-browser.mjs b/tests/run-browser.mjs
@@ -33,6 +33,45 @@ import os from "os";
 
 import {logInfo, logError, printHelp, runTest} from "./helper.mjs";
 
+const TESTS = [
+    {
+        name: "Run Single Suite",
+        tags: ["all", "main"],
+        run() {
+            return runEnd2EndTest("Run Single Suite", { test: "proxy-mobx" });
+        }
+    },
+    {
+        name: "Run Multiple Suites",
+        tags: ["all", "main"],
+        run() {
+            return runEnd2EndTest("Run Multiple Suites", { test: "prismjs-startup-es6,postcss-wtb" });
+        }
+    },
+    {
+        name: "Run Tag No Prefetch",
+        tags: ["all", "main"],
+        run() {
+            return runEnd2EndTest("Run Tag No Prefetch",  { tag: "proxy", prefetchResources: "false" });
+        }
+    },
+    {
+        name: "Run Disabled Suite",
+        tags: ["all", "disabled"],
+        run() {
+            return runEnd2EndTest("Run Disabled Suite", { tag: "disabled" });
+        }
+    },
+    {
+        name: "Run Default Suite",
+        tags: ["all", "default"],
+        run() {
+            return runEnd2EndTest("Run Default Suite");
+        }
+    }
+];
+
+const VALID_TAGS = Array.from(new Set(TESTS.map((each) => each.tags).flat()));
 
 function sleep(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
@@ -42,12 +81,16 @@ const optionDefinitions = [
     { name: "browser", type: String, description: "Set the browser to test, choices are [safari, firefox, chrome, edge]. By default the $BROWSER env variable is used." },
     { name: "port", type: Number, defaultValue: 8010, description: "Set the test-server port, The default value is 8010." },
     { name: "help", alias: "h", description: "Print this help text." },
+    { name: "suite", type: String, defaultOption: true, typeLabel: `{underline choices}: ${VALID_TAGS.join(", ")}`, description: "Run a specific suite by name." }
 ];
 
 const options = commandLineArgs(optionDefinitions);
 
 if ("help" in options)
-    printHelp(optionDefinitions);
+    printHelp("". optionDefinitions);
+
+if (options.suite && !VALID_TAGS.includes(options.suite))
+    printHelp(`Invalid suite: ${options.suite}. Choices are: ${VALID_TAGS.join(", ")}`);
 
 const BROWSER = options?.browser;
 if (!BROWSER)
@@ -73,7 +116,7 @@ switch (BROWSER) {
         break;
     }
     default: {
-        printHelp(`Invalid browser "${BROWSER}", choices are: "safari", "firefox", "chrome", "edge"`);
+        printHelp(`Invalid browser "${BROWSER}", choices are: "safari", "firefox", "chrome", "edge"`, optionDefinitions);
     }
 }
 
@@ -91,12 +134,19 @@ const server = await serve(PORT);
 
 async function runTests() {
     let success = true;
+    const suiteFilter = options.suite || "all";
+
+    const testsToRun = TESTS.filter(test => test.tags.includes(suiteFilter));
+
+    if (testsToRun.length === 0) {
+        console.error(`No suite found for filter: ${suiteFilter}`);
+        process.exit(1);
+    }
+
     try {
-        success &&= await runEnd2EndTest("Run Single Suite", { test: "proxy-mobx" });
-        success &&= await runEnd2EndTest("Run Multiple Suites", { test: "prismjs-startup-es6,postcss-wtb" });
-        success &&= await runEnd2EndTest("Run Tag No Prefetch",  { tag: "proxy", prefetchResources: "false" });
-        success &&= await runEnd2EndTest("Run Disabled Suite", { tag: "disabled" });
-        success &&= await runEnd2EndTest("Run Default Suite");
+        for (const test of testsToRun) {
+            success &&= await test.run();
+        }
     } finally {
         server.close();
     }
diff --git a/tests/run-shell.mjs b/tests/run-shell.mjs

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ export async function logGroup(name, body) {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`
`84`		`-export function printHelp(message = "", optionDefinitions) {`
	`84`	`+export function printHelp(message, optionDefinitions) {`
`85`	`85`	`const usage = commandLineUsage([`
`86`	`86`	`{`
`87`	`87`	`header: "Run all tests",`
`@@ -91,13 +91,13 @@ export function printHelp(message = "", optionDefinitions) {`
`91`	`91`	`optionList: optionDefinitions,`
`92`	`92`	`},`
`93`	`93`	`]);`
`94`		`- if (!message) {`
	`94`	`+ if (!message?.length) {`
`95`	`95`	`console.log(usage);`
`96`	`96`	`process.exit(0);`
`97`	`97`	`} else {`
`98`	`98`	`console.error(message);`
`99`		`- console.error();`
`100`		`- console.error(usage);`
	`99`	`+ console.log();`
	`100`	`+ console.log(usage);`
`101`	`101`	`process.exit(1);`
`102`	`102`	`}`
`103`	`103`	`}`