com pftt2: don't queue windows error reports: src/com/mostc/pftt/model/core/PhpBuild.java src/com/mostc/pftt/results/PhptResultReader.java
src/com/mostc/pftt/util/HostEnvUtil.java

Commit: 62d42d325dcb196d9a7171f35281c7cb3b58fd4f Author: Matt Ficken <v-mafick@microsoft.com> Mon, 5 Aug 2013 11:44:56 -0700 Parents: a92126f7cbf79396e1a57ef98fc8febce021c731 Branches: master Link: http://git.php.net/?p=pftt2.git;a=commitdiff;h=62d42d325dcb196d9a7171f35281c7cb3b58fd4f Log: don't queue windows error reports Former-commit-id: bd4eeb66c1ee9626aa6c3b1eec85e74fe44f8152 Changed paths: M src/com/mostc/pftt/model/core/PhpBuild.java M src/com/mostc/pftt/results/PhptResultReader.java M src/com/mostc/pftt/util/HostEnvUtil.java Diff: diff --git a/src/com/mostc/pftt/model/core/PhpBuild.java b/src/com/mostc/pftt/model/core/PhpBuild.java index b9f288b...f5f37aa 100644 --- a/src/com/mostc/pftt/model/core/PhpBuild.java +++ b/src/com/mostc/pftt/model/core/PhpBuild.java @@ -91,7 +91,12 @@ public class PhpBuild extends SAPIManager { host.move(build_path+"/php.ini", build_path+"/php_ini.bak"); } - return true; + if (host.exists(getPhpExe())) { + return true; + } else { + cm.println(EPrintType.CANT_CONTINUE, getClass(), "Unable to find: "+getPhpExe()); + return false; + } } catch ( Exception ex ) { cm.addGlobalException(EPrintType.CANT_CONTINUE, getClass(), "open", ex, "", host, build_path); } diff --git a/src/com/mostc/pftt/results/PhptResultReader.java b/src/com/mostc/pftt/results/PhptResultReader.java index 40321e9..6026be4 100644 --- a/src/com/mostc/pftt/results/PhptResultReader.java +++ b/src/com/mostc/pftt/results/PhptResultReader.java @@ -159,6 +159,7 @@ public class PhptResultReader extends AbstractPhptRW { e.test_names.remove("ext/mbstring/tests/mb_decode_numericentity.phpt"); e.test_names.remove("ext/standard/tests/strings/explode_bug.phpt"); e.test_names.remove("tests/lang/bug35176.phpt"); + e.test_names.remove("zend/tests/errmsg_020.phpt"); } return e.test_names; } diff --git a/src/com/mostc/pftt/util/HostEnvUtil..java b/src/com/mostc/pftt/util/HostEnvUtil.java index 1474c3e..4ff766c 100644 --- a/src/com/mostc/pftt/util/HostEnvUtil.java +++ b/src/com/mostc/pftt/util/HostEnvUtil.java @@ -65,6 +65,13 @@ public final class HostEnvUtil { boolean c = regQueryAdd(cm, host, "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Windows", "ErrorMode", em_value, REG_DWORD); if (!enable_debug_prompt) { + // WER may still queue reports to send (even though it never asks the user and never sends them) + // these reports can accumulate to 100s of MB and require regular cleaning + // disable queuing them + regQueryAdd(cm, host, "HKCU\\Software\\Microsoft\\Windows\\Windows Error Reporting", "DisableQueue", "0x1", REG_DWORD); + regQueryAdd(cm, host, "HKCU\\Software\\Microsoft\\Windows\\Windows Error Reporting", "ForceQueue", "0x0", REG_DWORD); + regQueryAdd(cm, host, "HKCU\\Software\\Microsoft\\Windows\\Windows Error Reporting", "LoggingDisabled", "0x1", REG_DWORD); + regDel(cm, host, "HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug", "Debugger"); // IMPORTANT: don't delete this key, change the value otherwise (if windbg installed) werfault.exe will // still launch windbg... won't if set to 0x2.