diff --git a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoBMIInstall-private.json b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoBMIInstall-private.json
index 65f0759776..e95c8ee351 100644
--- a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoBMIInstall-private.json
+++ b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoBMIInstall-private.json
@@ -6,9 +6,12 @@
     "script-location": "<BINARY_DIR>/CMakeFiles/ninja-bmi-install-private.dir/install-cxx-module-bmi-<CONFIG_FORCE>.cmake"
   },
   "compiler-id": "<IGNORE>",
+  "compiler-frontend-variant": "<IGNORE>",
+  "compiler-simulate-id": "<IGNORE>",
   "config": "<CONFIG>",
   "cxx-modules": {
     "CMakeFiles/ninja-bmi-install-private.dir/sources/module-internal-part.cxx.o": {
+      "bmi-only": false,
       "destination": null,
       "name": "internal_partitions",
       "relative-directory": "sources",
@@ -17,6 +20,7 @@
       "visibility": "PRIVATE"
     },
     "CMakeFiles/ninja-bmi-install-private.dir/sources/module-part.cxx.o": {
+      "bmi-only": false,
       "destination": null,
       "name": "modules",
       "relative-directory": "",
@@ -25,6 +29,7 @@
       "visibility": "PRIVATE"
     },
     "CMakeFiles/ninja-bmi-install-private.dir/sources/module.cxx.o": {
+      "bmi-only": false,
       "destination": null,
       "name": "modules",
       "relative-directory": "",
diff --git a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoBMIInstall-public.json b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoBMIInstall-public.json
index 9c8a8953d4..e1432b4863 100644
--- a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoBMIInstall-public.json
+++ b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoBMIInstall-public.json
@@ -6,9 +6,12 @@
     "script-location": "<BINARY_DIR>/CMakeFiles/ninja-bmi-install-public.dir/install-cxx-module-bmi-noconfig.cmake"
   },
   "compiler-id": "<IGNORE>",
+  "compiler-frontend-variant": "<IGNORE>",
+  "compiler-simulate-id": "<IGNORE>",
   "config": "<CONFIG>",
   "cxx-modules": {
     "CMakeFiles/ninja-bmi-install-public.dir/sources/module-internal-part.cxx.o": {
+      "bmi-only": false,
       "destination": "lib/cxx/internals",
       "name": "internal_partitions",
       "relative-directory": "sources",
@@ -17,6 +20,7 @@
       "visibility": "PUBLIC"
     },
     "CMakeFiles/ninja-bmi-install-public.dir/sources/module-part.cxx.o": {
+      "bmi-only": false,
       "destination": "lib/cxx",
       "name": "modules",
       "relative-directory": "",
@@ -25,6 +29,7 @@
       "visibility": "PUBLIC"
     },
     "CMakeFiles/ninja-bmi-install-public.dir/sources/module.cxx.o": {
+      "bmi-only": false,
       "destination": "lib/cxx",
       "name": "modules",
       "relative-directory": "",
diff --git a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExport-private.json b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExport-private.json
index 05459815ab..e6396182bf 100644
--- a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExport-private.json
+++ b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExport-private.json
@@ -1,9 +1,12 @@
 {
   "bmi-installation": null,
   "compiler-id": "<IGNORE>",
+  "compiler-frontend-variant": "<IGNORE>",
+  "compiler-simulate-id": "<IGNORE>",
   "config": "<CONFIG>",
   "cxx-modules": {
     "CMakeFiles/ninja-exports-private.dir/sources/module-internal-part.cxx.o": {
+      "bmi-only": false,
       "destination": null,
       "name": "internal_partitions",
       "relative-directory": "sources",
@@ -12,6 +15,7 @@
       "visibility": "PRIVATE"
     },
     "CMakeFiles/ninja-exports-private.dir/sources/module-part.cxx.o": {
+      "bmi-only": false,
       "destination": null,
       "name": "modules",
       "relative-directory": "",
@@ -20,6 +24,7 @@
       "visibility": "PRIVATE"
     },
     "CMakeFiles/ninja-exports-private.dir/sources/module.cxx.o": {
+      "bmi-only": false,
       "destination": null,
       "name": "modules",
       "relative-directory": "",
diff --git a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExport-public.json b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExport-public.json
index adc3ae391b..114d1eceff 100644
--- a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExport-public.json
+++ b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoExport-public.json
@@ -1,9 +1,12 @@
 {
   "bmi-installation": null,
   "compiler-id": "<IGNORE>",
+  "compiler-frontend-variant": "<IGNORE>",
+  "compiler-simulate-id": "<IGNORE>",
   "config": "<CONFIG>",
   "cxx-modules": {
     "CMakeFiles/ninja-exports-public.dir/sources/module-internal-part.cxx.o": {
+      "bmi-only": false,
       "destination": "lib/cxx/internals",
       "name": "internal_partitions",
       "relative-directory": "sources",
@@ -12,6 +15,7 @@
       "visibility": "PUBLIC"
     },
     "CMakeFiles/ninja-exports-public.dir/sources/module-part.cxx.o": {
+      "bmi-only": false,
       "destination": "lib/cxx",
       "name": "modules",
       "relative-directory": "",
@@ -20,6 +24,7 @@
       "visibility": "PUBLIC"
     },
     "CMakeFiles/ninja-exports-public.dir/sources/module.cxx.o": {
+      "bmi-only": false,
       "destination": "lib/cxx",
       "name": "modules",
       "relative-directory": "",
diff --git a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoFileSet-private.json b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoFileSet-private.json
index 9ba65688bb..bf2a78aed6 100644
--- a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoFileSet-private.json
+++ b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoFileSet-private.json
@@ -1,9 +1,12 @@
 {
   "bmi-installation": null,
   "compiler-id": "<IGNORE>",
+  "compiler-frontend-variant": "<IGNORE>",
+  "compiler-simulate-id": "<IGNORE>",
   "config": "<CONFIG>",
   "cxx-modules": {
     "CMakeFiles/ninja-file-sets-private.dir/sources/module-internal-part.cxx.o": {
+      "bmi-only": false,
       "destination": null,
       "name": "internal_partitions",
       "relative-directory": "sources",
@@ -12,6 +15,7 @@
       "visibility": "PRIVATE"
     },
     "CMakeFiles/ninja-file-sets-private.dir/sources/module-part.cxx.o": {
+      "bmi-only": false,
       "destination": null,
       "name": "modules",
       "relative-directory": "",
@@ -20,6 +24,7 @@
       "visibility": "PRIVATE"
     },
     "CMakeFiles/ninja-file-sets-private.dir/sources/module.cxx.o": {
+      "bmi-only": false,
       "destination": null,
       "name": "modules",
       "relative-directory": "",
diff --git a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoFileSet-public.json b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoFileSet-public.json
index 46e2cbf985..290754ec41 100644
--- a/Tests/RunCMake/CXXModules/expect/NinjaDependInfoFileSet-public.json
+++ b/Tests/RunCMake/CXXModules/expect/NinjaDependInfoFileSet-public.json
@@ -1,9 +1,12 @@
 {
   "bmi-installation": null,
   "compiler-id": "<IGNORE>",
+  "compiler-frontend-variant": "<IGNORE>",
+  "compiler-simulate-id": "<IGNORE>",
   "config": "<CONFIG>",
   "cxx-modules": {
     "CMakeFiles/ninja-file-sets-public.dir/<CONFIG_DIR>sources/module-internal-part.cxx.o": {
+      "bmi-only": false,
       "destination": "lib/cxx/internals",
       "name": "internal_partitions",
       "relative-directory": "sources",
@@ -12,6 +15,7 @@
       "visibility": "PUBLIC"
     },
     "CMakeFiles/ninja-file-sets-public.dir/<CONFIG_DIR>sources/module-part.cxx.o": {
+      "bmi-only": false,
       "destination": "lib/cxx",
       "name": "modules",
       "relative-directory": "",
@@ -20,6 +24,7 @@
       "visibility": "PUBLIC"
     },
     "CMakeFiles/ninja-file-sets-public.dir/<CONFIG_DIR>sources/module.cxx.o": {
+      "bmi-only": false,
       "destination": "lib/cxx",
       "name": "modules",
       "relative-directory": "",