From 70f6c04122db39b5d234715c373d690f97892f8b Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 1 May 2021 20:44:43 -0500 Subject: Add x64 Bundle tests. --- src/WixToolsetTest.BurnE2E/TestBAController.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/WixToolsetTest.BurnE2E/TestBAController.cs') diff --git a/src/WixToolsetTest.BurnE2E/TestBAController.cs b/src/WixToolsetTest.BurnE2E/TestBAController.cs index 103b603b..6e4fe6c6 100644 --- a/src/WixToolsetTest.BurnE2E/TestBAController.cs +++ b/src/WixToolsetTest.BurnE2E/TestBAController.cs @@ -9,14 +9,15 @@ namespace WixToolsetTest.BurnE2E public class TestBAController : IDisposable { - private const string BaseRegKeyPath = @"Software\WOW6432Node\WiX\Tests"; - - public TestBAController(WixTestContext testContext) + public TestBAController(WixTestContext testContext, bool x64 = false) { this.TestGroupName = testContext.TestGroupName; - this.TestBaseRegKeyPath = String.Format(@"{0}\TestBAControl\{1}", BaseRegKeyPath, this.TestGroupName); + this.BaseRegKeyPath = x64 ? @"Software\WiX\Tests" : @"Software\WOW6432Node\WiX\Tests"; + this.TestBaseRegKeyPath = String.Format(@"{0}\TestBAControl\{1}", this.BaseRegKeyPath, this.TestGroupName); } + private string BaseRegKeyPath { get; } + private string TestBaseRegKeyPath { get; } public string TestGroupName { get; } @@ -179,8 +180,8 @@ namespace WixToolsetTest.BurnE2E public void Dispose() { - Registry.LocalMachine.DeleteSubKeyTree($@"{BaseRegKeyPath}\{this.TestGroupName}", false); - Registry.LocalMachine.DeleteSubKeyTree($@"{BaseRegKeyPath}\TestBAControl", false); + Registry.LocalMachine.DeleteSubKeyTree($@"{this.BaseRegKeyPath}\{this.TestGroupName}", false); + Registry.LocalMachine.DeleteSubKeyTree($@"{this.BaseRegKeyPath}\TestBAControl", false); } } } -- cgit v1.2.3-55-g6feb