diff --git a/prelinked/bootstrap-gen0/.m3_compiler_lib_sidecar.sha b/prelinked/bootstrap-gen0/.m3_compiler_lib_sidecar.sha index 42352ada32f..15ee168e1b4 100755 --- a/prelinked/bootstrap-gen0/.m3_compiler_lib_sidecar.sha +++ b/prelinked/bootstrap-gen0/.m3_compiler_lib_sidecar.sha @@ -1 +1 @@ -e62d3ec969206c7e4e364eafed00dc9839590dee +046998584f26f4183fcc226d3f306083ae2f237d diff --git a/script/bootstrap-selfhost-lib-spine-smoke-link.sh b/script/bootstrap-selfhost-lib-spine-smoke-link.sh index 3d2ec6536ba..584cc01d086 100755 --- a/script/bootstrap-selfhost-lib-spine-smoke-link.sh +++ b/script/bootstrap-selfhost-lib-spine-smoke-link.sh @@ -247,6 +247,7 @@ if [[ "${run_code}" -eq 139 ]]; then bootstrap_spine_emit_crash_diag "${OUT}" "${OUT}" fi out="${run_out}" +vm_driver_probe_ok=0 if ! grep -q 'compiler_lib_spine_smoke bundle OK' <<< "${out}"; then set +e probe_out="$(env PHP_COMPILER_VM_DRIVER_EXECUTE=1 "${OUT}" 2>&1)" @@ -255,6 +256,7 @@ if ! grep -q 'compiler_lib_spine_smoke bundle OK' <<< "${out}"; then if [[ "${probe_code}" -eq 0 ]] && grep -q 'vm driver ok' <<< "${probe_out}"; then echo "bootstrap-selfhost-lib-spine-smoke-link: bundle run failed but VM driver env probe OK (#8559)" >&2 out="${probe_out}" + vm_driver_probe_ok=1 else echo "bootstrap-selfhost-lib-spine-smoke-link: unexpected stdout (want compiler_lib_spine_smoke bundle OK)" >&2 printf '%s\n' "${out}" >&2 @@ -264,7 +266,9 @@ fi want_sha="$(bootstrap_compiler_lib_spine_entry_sha)" || true if [[ -n "${want_sha:-}" ]]; then refresh_sidecar=0 - if strings "${OUT}" 2>/dev/null | grep -q 'vm driver ok'; then + if [[ "${vm_driver_probe_ok}" == "1" ]]; then + refresh_sidecar=1 + elif strings "${OUT}" 2>/dev/null | grep -q 'vm driver ok'; then refresh_sidecar=1 elif [[ -x "${OUT}" ]] && grep -q 'compiler_lib_spine_smoke bundle OK' <<< "${out}"; then # Native full-spine emit succeeded; refresh sidecar even when env-probe strings diff --git a/test/unit/BootstrapLibSpineVmSmokeTest.php b/test/unit/BootstrapLibSpineVmSmokeTest.php index 5e35d37ee95..236023fc8cf 100644 --- a/test/unit/BootstrapLibSpineVmSmokeTest.php +++ b/test/unit/BootstrapLibSpineVmSmokeTest.php @@ -65,6 +65,8 @@ public function testLibSpineLinkScriptSeedsSidecarsAndRefusesZendFallback(): voi $this->assertStringContainsString('inventory argv driver unavailable (no Zend — #8716)', $script); $this->assertStringContainsString('BOOTSTRAP_LIB_SPINE_SMOKE_GEN0_FALLBACK', $script); $this->assertStringContainsString('BOOTSTRAP_NO_ZEND_FALLBACK:-0}" != "1"', $script); + $this->assertStringContainsString('vm_driver_probe_ok=1', $script); + $this->assertStringContainsString('vm_driver_probe_ok}" == "1"', $script); } public function testSpineEntryBundlesBinVmPhp(): void