wyvrnpm 2.16.1 → 2.17.0

package/README.md

@@ -39,12 +39,6 @@ npm install -g wyvrnpm
 
 Requires Node.js >= 18.
 
-For S3 publishing, also install the AWS SDK:
-
-```bash
-npm install -g @aws-sdk/client-s3 @aws-sdk/credential-providers
-```
-
 ### Update notifier
 
 When a newer `wyvrnpm` is published to npm, the next interactive run prints a single-line banner on stderr:
@@ -391,15 +385,17 @@ After download, `install` also generates:
 
 The optional helper `WYVRN_APPLY_ARCH_SUFFIX(<target> [BASE_NAME <name>])` from the bundled `macros.cmake` applies the suffix to a target's `OUTPUT_NAME` so x64 and x86 builds of the same library coexist on disk without overwriting each other. Target linkage (`target_link_libraries`) is unaffected — only the produced filename changes.
 
-The bundled `variables.cmake` also suffixes the consumer's own output directories with `WYVRN_ARCH_SUFFIX` so multi-arch builds from one source tree don't clobber each other:
+The bundled `variables.cmake` puts compiled artefacts inside the CMake binary dir so `wyvrnpm clean --all` (which sweeps `<binaryDirRoot>/wyvrn-*/`) catches them:
 
-| Profile arch | Archive/library dir | Runtime (DLL/EXE) dir |
-|---|---|---|
-| `x86_64` / `armv8` | `output/lib64/` | `output/bin64/<CONFIG>/` |
-| `x86` / `armv7` | `output/lib/` | `output/bin/<CONFIG>/` |
-| unmapped | `output/lib/` | `output/bin/<CONFIG>/` |
+| Variable | Value |
+|---|---|
+| `CMAKE_ARCHIVE_OUTPUT_DIRECTORY` | `${CMAKE_BINARY_DIR}/lib/` |
+| `CMAKE_LIBRARY_OUTPUT_DIRECTORY` | `${CMAKE_BINARY_DIR}/lib/` |
+| `CMAKE_RUNTIME_OUTPUT_DIRECTORY` | `${CMAKE_BINARY_DIR}/bin` |
+
+With per-profile build dirs (`build/wyvrn-x64-msvc/` vs `build/wyvrn-x86-msvc/`) already isolating multi-arch builds, the output directories themselves don't carry an arch suffix — but `WYVRN_APPLY_ARCH_SUFFIX` still stamps the suffix onto artefact **names** (`String64.lib` vs `String32.lib`) for the cross-arch ship-together case.
 
-Prior to `2.5.0` the runtime directory was always `output/bin/<CONFIG>/` regardless of arch — a multi-arch consumer building x64 then x86 would silently overwrite the first arch's DLLs. Scripts that hard-code `output/bin/…` expecting x64 payloads need to switch to `output/bin64/…` after upgrading.
+Prior to `2.17.0` outputs landed in `${CMAKE_SOURCE_DIR}/output/{bin,lib}${WYVRN_ARCH_SUFFIX}/` — outside the build dir, so `wyvrnpm clean --all` left binaries behind. Scripts that hard-code `output/bin64/foo.exe` must switch to `<binaryDir>/bin/<CONFIG>/foo.exe` (multi-config generators) or `<binaryDir>/bin/foo.exe` (single-config). Run `wyvrnpm clean --all` after upgrade — it sweeps the legacy `output/` tree as a migration aid.
 
 ```cmake
 project(String CXX)

package/bin/wyvrnpm.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 'use strict';
 
@@ -16,6 +16,7 @@ const publish      = require('../src/commands/publish');
 const configure    = require('../src/commands/configure');
 const profile      = require('../src/commands/profile');
 const build        = require('../src/commands/build');
+const test         = require('../src/commands/test');
 const show         = require('../src/commands/show');
 const installSkill = require('../src/commands/install-skill');
 const cache        = require('../src/commands/cache');
@@ -435,6 +436,110 @@ yargs
     }),
   )
 
+  // ── test ──────────────────────────────────────────────────────────────────
+  .command(
+    'test',
+    'Run ctest against the wyvrnpm-generated test preset. ' +
+    'Auto-runs `wyvrnpm build` if the toolchain is missing or stale (disable with --no-build).',
+    (y) => {
+      y
+        .option('preset', {
+          alias: 'P',
+          type: 'string',
+          description: 'CMake test preset name (default: wyvrn-<profile>-<config>)',
+        })
+        .option('profile', {
+          alias: 'p',
+          type: 'string',
+          description: 'Build profile name — determines the default preset',
+        })
+        .option('config', {
+          alias: 'c',
+          type: 'string',
+          default: 'Release',
+          description:
+            'Build configuration to test. Accepts a single value (Release) ' +
+            'or a comma-separated list (Debug,Release) to run ctest per ' +
+            'config. Valid: Debug | Release | RelWithDebInfo | MinSizeRel.',
+        })
+        .option('all-configs', {
+          type: 'boolean',
+          default: false,
+          description:
+            'Run tests for every config declared in the recipe\'s build.configs ' +
+            '(falls back to all four canonical configs when no recipe is present). ' +
+            'Equivalent to spelling out --config Debug,Release,... by hand.',
+        })
+        .option('verbose', {
+          alias: 'v',
+          type: 'boolean',
+          default: false,
+          description: 'Pass -V to ctest (extra detail per test)',
+        })
+        .option('tests-regex', {
+          alias: 'R',
+          type: 'string',
+          description: 'Run only tests whose name matches the regex (forwards to ctest -R)',
+        })
+        .option('label-regex', {
+          alias: 'L',
+          type: 'string',
+          description: 'Run only tests whose label matches the regex (forwards to ctest -L)',
+        })
+        .option('auto-build', {
+          type: 'boolean',
+          default: true,
+          description:
+            'Auto-run `wyvrnpm build` when the toolchain is stale. ' +
+            'Disable with --no-build (alias) or --no-auto-build.',
+        })
+        .option('no-build', {
+          type: 'boolean',
+          default: false,
+          description: 'Shorthand for --no-auto-build — skip the staleness check, just run ctest.',
+        })
+        .option('source', {
+          alias: 's',
+          type: 'string',
+          array: true,
+          description: 'Package source(s) — forwarded to auto-build when triggered',
+        })
+        .option('platform', {
+          type: 'string',
+          choices: ['win_x64', 'win_x86', 'linux_x64', 'linux_x86', 'osx_x64', 'osx_arm64'],
+          default: 'win_x64',
+        })
+        .option('timeout', {
+          type: 'number',
+          default: 300,
+        })
+        .option('build-dir', {
+          type: 'string',
+          description:
+            'Project-relative subdir for the build tree (default: "build"). ' +
+            'Must match the value used at install/build time. For persistent ' +
+            'override, set `binaryDirRoot` in wyvrn.local.json.',
+        })
+        .option('format', {
+          type: 'string',
+          choices: ['text', 'json'],
+          default: 'text',
+          description:
+            'Output mode. `json` emits a structured summary on stdout ' +
+            '(per-config total/passed/failed/duration/exitCode) and routes ' +
+            'log lines to stderr. Use for CI gating.',
+        });
+    },
+    (argv) => test({
+      ...argv,
+      allConfigs: argv['all-configs'],
+      autoBuild:  argv['no-build'] ? false : argv['auto-build'],
+      buildDir:   argv['build-dir'],
+      testsRegex: argv['tests-regex'],
+      labelRegex: argv['label-regex'],
+    }),
+  )
+
   // ── cache ─────────────────────────────────────────────────────────────────
   .command(
     'cache',

package/cmake/variables.cmake

@@ -161,19 +161,18 @@ else()
     message(STATUS "Unknown architecture")
 endif()
 
-# Output dirs are suffixed with WYVRN_ARCH_SUFFIX ("64" / "32" / "") so
-# multi-arch builds from the same source tree don't clobber each other
-# (e.g. building x64 then x86 used to silently overwrite the x64 DLLs
-# in output/bin/<CONFIG>/). Single-arch consumers see no path change on
-# x86 or unmapped arches — the suffix is empty there. Set defensively:
-# if wyvrn_toolchain.cmake hasn't been included (standalone cmake runs),
-# WYVRN_ARCH_SUFFIX is undefined and we fall back to the legacy layout.
-if(NOT DEFINED WYVRN_ARCH_SUFFIX)
-    set(WYVRN_ARCH_SUFFIX "")
-endif()
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/output/lib${WYVRN_ARCH_SUFFIX}/")
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/output/lib${WYVRN_ARCH_SUFFIX}/")
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/output/bin${WYVRN_ARCH_SUFFIX}")
+# Put compiled artefacts inside the CMake binary dir so `wyvrnpm clean --all`
+# (which sweeps `<binaryDirRoot>/wyvrn-*/`) catches them. Pre-2.17 wyvrnpm
+# put these under `${CMAKE_SOURCE_DIR}/output/<bin|lib>${WYVRN_ARCH_SUFFIX}/`
+# which leaked binaries into the source tree and survived clean.
+# Per-profile build dirs (build/wyvrn-x64-msvc/ vs build/wyvrn-x86-msvc/)
+# already isolate multi-arch builds, so the WYVRN_ARCH_SUFFIX directory
+# suffix is redundant and dropped here. WYVRN_ARCH_SUFFIX itself stays
+# exposed by wyvrn_toolchain.cmake and is still applied to artefact NAMES
+# via WYVRN_APPLY_ARCH_SUFFIX (cmake/macros.cmake).
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 add_compile_definitions(
     $<$<CONFIG:Debug>:WYVRN_DEBUG>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wyvrnpm",
-  "version": "2.16.1",
+  "version": "2.17.0",
   "description": "A simple, static-hosting-compatible C++ package manager",
   "keywords": [
     "c++",

package/src/commands/clean.js

@@ -136,7 +136,7 @@ function stripPresetsFromWorkspace(rootDir, { dryRun }) {
  * Flag matrix:
  *   - (default)        wyvrn_internal/ + wyvrn.lock
  *   - --build-dir      also the active profile's wyvrn-<profile> build dir
- *   - --all            default set + every wyvrn-prefixed build dir + wyvrn-prefixed preset entries
+ *   - --all            default set + every wyvrn-prefixed build dir + wyvrn-prefixed preset entries + legacy <root>/output/ tree
  *   - --build-cache    also the machine-wide source-build cache
  *   - --uploaded-built wipe just the upload sidecars (targeted-only when used
  *                      alone — does not also do the default scrub)
@@ -197,6 +197,18 @@ async function clean(argv) {
     }
   }
 
+  // --all: sweep the legacy <root>/output/ tree from pre-2.17 wyvrnpm. Old
+  // cmake/variables.cmake hardcoded CMAKE_{RUNTIME,LIBRARY,ARCHIVE}_OUTPUT_DIRECTORY
+  // under ${CMAKE_SOURCE_DIR}/output/{bin,lib}${WYVRN_ARCH_SUFFIX}/, outside
+  // the build dir — clean --all missed it. Projects that already rebuilt
+  // under the new layout simply won't have this directory.
+  if (argv.all) {
+    const legacyOutputDir = path.join(rootDir, 'output');
+    if (removePath(legacyOutputDir, { dryRun, label: legacyOutputDir })) {
+      removedAnything = true;
+    }
+  }
+
   // --all: also strip wyvrn-* entries from CMakePresets.json / CMakeUserPresets.json.
   if (argv.all) {
     const touched = stripPresetsFromWorkspace(rootDir, { dryRun });

package/src/commands/test.js

@@ -0,0 +1,302 @@
+'use strict';
+
+const { spawn } = require('child_process');
+
+const { normalizeRecipe, hasBuildRecipe } = require('../build/recipe');
+const { buildContext } = require('../context');
+const build            = require('./build');
+const log              = require('../logger');
+const { version: WYVRNPM_VERSION } = require('../../package.json');
+
+const { isToolchainStale, resolveConfigList } = build._helpers;
+
+// ---------------------------------------------------------------------------
+// Pure helpers (unit-testable — no process spawning)
+// ---------------------------------------------------------------------------
+
+/**
+ * Resolve the test preset name for a given (profile, config). Mirrors the
+ * naming emitted by `buildTestPresets` in [src/toolchain/presets.js]:
+ * `wyvrn-<profile>-<config-lowercased>`. CLI `--preset` overrides the
+ * computed name when provided.
+ *
+ * @param {{ presetOverride?: string|null, profileName: string, config: string }} args
+ * @returns {string}
+ */
+function resolveTestPresetName({ presetOverride, profileName, config }) {
+  if (presetOverride) return presetOverride;
+  return `wyvrn-${profileName}-${config.toLowerCase()}`;
+}
+
+/**
+ * Build the ctest argv for a single preset invocation.
+ *
+ * @param {{
+ *   presetName: string,
+ *   verbose?:  boolean,
+ *   testsRegex?: string|null,
+ *   labelRegex?: string|null,
+ *   passthru?: string[],
+ * }} args
+ * @returns {string[]}
+ */
+function buildCtestArgs({
+  presetName,
+  verbose = false,
+  testsRegex = null,
+  labelRegex = null,
+  passthru = [],
+}) {
+  const args = ['--preset', presetName];
+  if (verbose)    args.push('-V');
+  if (testsRegex) args.push('-R', testsRegex);
+  if (labelRegex) args.push('-L', labelRegex);
+  if (passthru.length > 0) args.push(...passthru);
+  return args;
+}
+
+/**
+ * Parse ctest's tail summary from captured stdout. ctest emits a stable
+ * summary line near the end of every run:
+ *
+ *   100% tests passed, 0 tests failed out of 42
+ *   Total Test time (real) =   1.23 sec
+ *
+ * Returns `null` for any field that couldn't be parsed (e.g. when ctest
+ * found no tests — "No tests were found!!!" — which is itself a valid
+ * outcome). Callers fall back to `exitCode` for pass/fail in that case.
+ *
+ * @param {string} stdout
+ * @returns {{ total: number|null, passed: number|null, failed: number|null, durationMs: number|null }}
+ */
+function parseCtestSummary(stdout) {
+  const summaryMatch = stdout.match(
+    /(\d+(?:\.\d+)?)%\s+tests\s+passed,\s+(\d+)\s+tests?\s+failed\s+out\s+of\s+(\d+)/,
+  );
+  const timeMatch = stdout.match(
+    /Total Test time \(real\)\s*=\s*([\d.]+)\s*sec/,
+  );
+
+  if (!summaryMatch) {
+    return {
+      total:      null,
+      passed:     null,
+      failed:     null,
+      durationMs: timeMatch ? Math.round(parseFloat(timeMatch[1]) * 1000) : null,
+    };
+  }
+
+  const failed = parseInt(summaryMatch[2], 10);
+  const total  = parseInt(summaryMatch[3], 10);
+  return {
+    total,
+    failed,
+    passed:     total - failed,
+    durationMs: timeMatch ? Math.round(parseFloat(timeMatch[1]) * 1000) : null,
+  };
+}
+
+// ---------------------------------------------------------------------------
+// Spawn wrapper
+// ---------------------------------------------------------------------------
+
+/**
+ * Run `ctest` with the given args.
+ *
+ * - Text mode: inherits stdio for real-time output. Returns `{ exitCode }`.
+ * - JSON mode: pipes stdout, tees to stderr so the user still sees progress,
+ *   captures the full stdout for summary parsing. Returns
+ *   `{ exitCode, capturedStdout }`.
+ *
+ * Resolves with the exit code (never rejects on non-zero — callers decide
+ * how to aggregate across configs).
+ *
+ * @param {string[]} args
+ * @param {{ captureStdout: boolean }} opts
+ * @returns {Promise<{ exitCode: number, capturedStdout: string }>}
+ */
+function runCtest(args, { captureStdout }) {
+  return new Promise((resolve, reject) => {
+    const stdio = captureStdout
+      ? ['inherit', 'pipe', 'inherit']
+      : 'inherit';
+    const proc = spawn('ctest', args, { stdio });
+    let captured = '';
+    if (captureStdout && proc.stdout) {
+      proc.stdout.on('data', (chunk) => {
+        const text = chunk.toString('utf8');
+        captured += text;
+        process.stderr.write(text);
+      });
+    }
+    proc.on('error', (err) => {
+      reject(new Error(
+        `Failed to spawn ctest: ${err.message}\n` +
+        '  Is CMake installed and on PATH?',
+      ));
+    });
+    proc.on('close', (code) => {
+      resolve({ exitCode: code ?? 1, capturedStdout: captured });
+    });
+  });
+}
+
+// ---------------------------------------------------------------------------
+// Command entry
+// ---------------------------------------------------------------------------
+
+/**
+ * `wyvrnpm test` — run ctest against the wyvrnpm-generated test preset.
+ *
+ * Auto-runs `wyvrnpm build` first when the toolchain is stale or missing
+ * (mirrors `wyvrnpm build`'s auto-install). Disable with `--no-build`.
+ *
+ * Per-config loop: same precedence as `wyvrnpm build` —
+ * `--all-configs` > `--config X,Y` > `Release`. ctest is one-config-per-
+ * invocation, so multi-config means N spawns. Exit code is 0 iff every
+ * config returns 0.
+ *
+ * `--format json` emits a structured summary on stdout (log lines route
+ * to stderr); summary stats parsed from ctest's tail output.
+ *
+ * @param {object} argv
+ */
+async function test(argv) {
+  if (argv.format === 'json') log.setJsonMode(true);
+
+  let ctx;
+  try {
+    ctx = buildContext(argv);
+  } catch (err) {
+    log.error(err.message);
+    process.exit(1);
+  }
+
+  const { rootDir, manifestPath } = ctx;
+  const { name: profileName } = ctx.profiles.host;
+
+  // Resolve the recipe's config list up front so --all-configs has
+  // something to consult. Same fallback chain as `wyvrnpm build`.
+  let configList;
+  try {
+    const recipe = hasBuildRecipe(ctx.manifest)
+      ? (() => { try { return normalizeRecipe(ctx.manifest.build, null); } catch { return null; } })()
+      : null;
+    configList = resolveConfigList({ argv, recipeConfigs: recipe?.configs ?? null });
+  } catch (err) {
+    log.error(err.message);
+    process.exit(1);
+  }
+
+  // ── Stale check / auto-build ─────────────────────────────────────────────
+  // `--no-build` (i.e. argv.autoBuild === false) opts out of the auto-build
+  // before ctest. Default behaviour matches `wyvrnpm build`'s auto-install
+  // gate: if the toolchain or build outputs look stale, run build first.
+  // We delegate to `build()` rather than reaching into install — build
+  // already handles its own staleness checks and forwards to install when
+  // needed. Pass --install:false so the build dir holds artefacts ctest
+  // can actually reach.
+  const staleness = isToolchainStale({ rootDir, manifestPath });
+  if (staleness.stale) {
+    if (argv.autoBuild === false) {
+      log.error(
+        `Toolchain is stale (${staleness.reason}) and --no-build was passed.\n` +
+        '  Run: wyvrnpm build  (or omit --no-build)',
+      );
+      process.exit(1);
+    }
+    log.info(`Toolchain ${staleness.reason} — running build first`);
+    await build({
+      manifest:   argv.manifest,
+      root:       argv.root,
+      profile:    argv.profile,
+      source:     argv.source,
+      platform:   argv.platform ?? 'win_x64',
+      timeout:    argv.timeout  ?? 300,
+      buildDir:   argv.buildDir,
+      preset:     argv.preset,
+      config:     argv.config,
+      allConfigs: argv.allConfigs,
+      verbose:    false,           // build's stdout would muddy --format json
+      install:    false,           // we want artefacts in the build dir, not an install tree
+      autoInstall: true,
+    });
+  }
+
+  // ── Per-config ctest loop ────────────────────────────────────────────────
+  if (configList.length > 1) {
+    log.info(`Testing ${configList.length} configs: ${configList.join(', ')}`);
+  }
+
+  const jsonMode = argv.format === 'json';
+  const passthru = argv['--'] ?? [];
+  const results  = [];
+
+  for (const config of configList) {
+    const presetName = resolveTestPresetName({
+      presetOverride: argv.preset,
+      profileName,
+      config,
+    });
+    const ctestArgs = buildCtestArgs({
+      presetName,
+      verbose:    argv.verbose,
+      testsRegex: argv.testsRegex,
+      labelRegex: argv.labelRegex,
+      passthru,
+    });
+    log.info(`ctest ${ctestArgs.join(' ')}`);
+
+    const { exitCode, capturedStdout } = await runCtest(ctestArgs, {
+      captureStdout: jsonMode,
+    });
+
+    const summary = jsonMode ? parseCtestSummary(capturedStdout) : {
+      total: null, passed: null, failed: null, durationMs: null,
+    };
+    results.push({
+      config,
+      preset:     presetName,
+      total:      summary.total,
+      passed:     summary.passed,
+      failed:     summary.failed,
+      durationMs: summary.durationMs,
+      exitCode,
+    });
+  }
+
+  const passedConfigs = results.filter((r) => r.exitCode === 0).length;
+  const failedConfigs = results.length - passedConfigs;
+  const ok = failedConfigs === 0;
+
+  if (jsonMode) {
+    const payload = {
+      command:        'test',
+      wyvrnpmVersion: WYVRNPM_VERSION,
+      profile:        profileName,
+      configs:        results,
+      totalConfigs:   results.length,
+      passedConfigs,
+      failedConfigs,
+      ok,
+    };
+    process.stdout.write(JSON.stringify(payload, null, 2) + '\n');
+  } else if (ok) {
+    log.success(`Tests passed (${results.length} config${results.length === 1 ? '' : 's'}: ${configList.join(', ')})`);
+  } else {
+    const failedNames = results.filter((r) => r.exitCode !== 0).map((r) => r.config).join(', ');
+    log.error(`Tests failed in ${failedConfigs}/${results.length} config(s): ${failedNames}`);
+  }
+
+  if (!ok) process.exit(1);
+}
+
+module.exports = test;
+module.exports.default = test;
+
+// Exported for unit tests
+module.exports._helpers = {
+  resolveTestPresetName,
+  buildCtestArgs,
+  parseCtestSummary,
+};

package/src/index.js

@@ -3,6 +3,8 @@
 module.exports = {
   init:      require('./commands/init'),
   install:   require('./commands/install'),
+  build:     require('./commands/build'),
+  test:      require('./commands/test'),
   clean:     require('./commands/clean'),
   publish:   require('./commands/publish'),
   configure: require('./commands/configure'),

package/src/toolchain/presets.js

@@ -187,6 +187,41 @@ function buildBuildPresets(profileName, configs = null) {
   }));
 }
 
+/**
+ * One ctest preset per configuration the recipe declares (or the
+ * legacy default pair `Debug` + `Release` when no list is provided).
+ *
+ * Test presets share their name with the matching build preset
+ * (`wyvrn-<profile>-<config>`) — CMake's preset name namespaces are
+ * per-array, so `cmake --build --preset wyvrn-default-release` and
+ * `ctest --preset wyvrn-default-release` can both resolve without
+ * collision. That symmetry is the whole point: the user types one
+ * preset name across both tools.
+ *
+ * `output.outputOnFailure: true` defaults to ctest's `--output-on-failure`
+ * — the only sane default for CI consumption. `execution.stopOnFailure:
+ * false` lets the full suite run rather than bailing on the first
+ * failure (Conan/Catch2 convention).
+ *
+ * @param {string} profileName
+ * @param {string[]|null} [configs]  Recipe's declared configurations.
+ * @returns {Array<object>}
+ */
+function buildTestPresets(profileName, configs = null) {
+  const base = `wyvrn-${profileName}`;
+  const list = (Array.isArray(configs) && configs.length > 0)
+    ? configs
+    : ['Debug', 'Release'];
+  return list.map((cfg) => ({
+    name:            `${base}-${cfg.toLowerCase()}`,
+    displayName:     `wyvrn ${profileName} (${cfg})`,
+    configurePreset: base,
+    configuration:   cfg,
+    output:          { outputOnFailure: true },
+    execution:       { stopOnFailure: false },
+  }));
+}
+
 /**
  * Build a fresh presets file from scratch (no prior content to merge).
  */
@@ -214,6 +249,7 @@ function buildFreshPresetsFile({
       profileName, profileHash, toolchainRelPath, generator, extraCacheVariables, installDir, profileArch, configs, binaryDirRoot,
     })],
     buildPresets: buildBuildPresets(profileName, configs),
+    testPresets:  buildTestPresets(profileName, configs),
   };
 }
 
@@ -242,6 +278,7 @@ function mergeIntoExisting(existing, {
     profileName, profileHash, toolchainRelPath, generator, extraCacheVariables, installDir, profileArch, configs, binaryDirRoot,
   });
   const newBuilds    = buildBuildPresets(profileName, configs);
+  const newTests     = buildTestPresets(profileName, configs);
   const newConfigureNames = new Set([newConfigure.name]);
   // When replacing THIS profile's build presets, drop every pre-existing
   // one that targets the same configurePreset — the fresh `newBuilds`
@@ -253,7 +290,7 @@ function mergeIntoExisting(existing, {
   // leave orphan build presets pointing at configurations CMake won't
   // generate.
   const myBase = `wyvrn-${profileName}`;
-  const isMyBuildPreset = (p) => p && p.configurePreset === myBase;
+  const isMyChildPreset = (p) => p && p.configurePreset === myBase;
 
   const configurePresets = (existing.configurePresets ?? []).filter((p) => !newConfigureNames.has(p.name));
   configurePresets.push(newConfigure);
@@ -262,9 +299,16 @@ function mergeIntoExisting(existing, {
   // configurePreset — the fresh `newBuilds` list (one per current
   // `configs` entry) fully replaces them. Presets for OTHER profiles
   // stay untouched so the multi-profile merge story is preserved.
-  const buildPresets = (existing.buildPresets ?? []).filter((p) => !isMyBuildPreset(p));
+  const buildPresets = (existing.buildPresets ?? []).filter((p) => !isMyChildPreset(p));
   buildPresets.push(...newBuilds);
 
+  // Same logic for testPresets — scoped to THIS profile's configurePreset
+  // so user-named test presets and other-profile entries survive
+  // byte-identical. Files written by pre-2.18 wyvrnpm have no testPresets
+  // array; we just create one.
+  const testPresets = (existing.testPresets ?? []).filter((p) => !isMyChildPreset(p));
+  testPresets.push(...newTests);
+
   return {
     ...existing,
     version: existing.version ?? SCHEMA_VERSION,
@@ -278,6 +322,7 @@ function mergeIntoExisting(existing, {
     },
     configurePresets,
     buildPresets,
+    testPresets,
   };
 }
 
@@ -387,6 +432,13 @@ function stripWyvrnPresets(existing) {
     }
     return true;
   });
+  const testPresets = (existing.testPresets ?? []).filter((p) => {
+    if (p && (isWyvrnName(p.name) || isWyvrnName(p.configurePreset))) {
+      removed.push(p.name);
+      return false;
+    }
+    return true;
+  });
 
   // Drop our vendor marker; preserve any foreign vendor entries.
   let vendor = existing.vendor;
@@ -398,10 +450,10 @@ function stripWyvrnPresets(existing) {
   // Decide if anything meaningful survives. The schema `version` field
   // is metadata, not content — a file with only `{ version: 3 }` is a
   // husk we should delete.
-  const hasSurvivingPresets = configurePresets.length > 0 || buildPresets.length > 0;
+  const hasSurvivingPresets = configurePresets.length > 0 || buildPresets.length > 0 || testPresets.length > 0;
   const hasForeignVendor = vendor !== undefined;
   const otherTopLevelKeys = Object.keys(existing).filter(
-    (k) => k !== 'version' && k !== 'vendor' && k !== 'configurePresets' && k !== 'buildPresets',
+    (k) => k !== 'version' && k !== 'vendor' && k !== 'configurePresets' && k !== 'buildPresets' && k !== 'testPresets',
   );
 
   if (!hasSurvivingPresets && !hasForeignVendor && otherTopLevelKeys.length === 0) {
@@ -413,6 +465,8 @@ function stripWyvrnPresets(existing) {
   else delete result.configurePresets;
   if (buildPresets.length > 0) result.buildPresets = buildPresets;
   else delete result.buildPresets;
+  if (testPresets.length > 0) result.testPresets = testPresets;
+  else delete result.testPresets;
   if (vendor !== undefined) result.vendor = vendor;
   else delete result.vendor;
 
@@ -427,6 +481,7 @@ module.exports = {
   isWyvrnGenerated,
   buildConfigurePreset,
   buildBuildPresets,
+  buildTestPresets,
   buildFreshPresetsFile,
   mergeIntoExisting,
   VENDOR_KEY,