diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-05-13 13:50:50 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-05-14 11:12:31 -0500 |
commit | 6a6974a15deb6edf593736cdb8043bfb93064782 (patch) | |
tree | 0ae2afffcd02967ba3fe0f0a5d3e9273811f1e6f /src/test/burn/TestBA/TestBA.cs | |
parent | 7d56566b7c51c49ded526466dfae6af9e1709040 (diff) | |
download | wix-6a6974a15deb6edf593736cdb8043bfb93064782.tar.gz wix-6a6974a15deb6edf593736cdb8043bfb93064782.tar.bz2 wix-6a6974a15deb6edf593736cdb8043bfb93064782.zip |
Move infinite loop detection into the hosts.
Tell the BA during Destroy whether it will be reloaded, and let the BA decide then whether it's module should be unloaded.
Show error when infinite prereq loop detected.
Only clip the exit code if they're Win32 errors.
Set related bundle type to none to avoid downgrades during preqba.
Diffstat (limited to 'src/test/burn/TestBA/TestBA.cs')
-rw-r--r-- | src/test/burn/TestBA/TestBA.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/test/burn/TestBA/TestBA.cs b/src/test/burn/TestBA/TestBA.cs index 5f492efd..1548c05b 100644 --- a/src/test/burn/TestBA/TestBA.cs +++ b/src/test/burn/TestBA/TestBA.cs | |||
@@ -171,7 +171,13 @@ namespace WixToolset.Test.BA | |||
171 | this.dummyWindow.Dispose(); | 171 | this.dummyWindow.Dispose(); |
172 | } | 172 | } |
173 | 173 | ||
174 | this.Engine.Quit(this.result & 0xFFFF); // return plain old Win32 error, not HRESULT. | 174 | var exitCode = this.result; |
175 | if ((exitCode & 0xFFFF0000) == unchecked(0x80070000)) | ||
176 | { | ||
177 | exitCode &= 0xFFFF; // return plain old Win32 error, not HRESULT. | ||
178 | } | ||
179 | |||
180 | this.Engine.Quit(exitCode); | ||
175 | } | 181 | } |
176 | 182 | ||
177 | protected override void OnDetectUpdateBegin(DetectUpdateBeginEventArgs args) | 183 | protected override void OnDetectUpdateBegin(DetectUpdateBeginEventArgs args) |