summaryrefslogtreecommitdiff
path: root/src/burn/test/BurnUnitTest/RegistrationTest.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-03-16 15:20:15 -0500
committerSean Hall <r.sean.hall@gmail.com>2022-03-16 20:14:37 -0500
commit8c9ca787bee29f969cd7ca9aeaa46626d557d196 (patch)
tree8a7278a4035b584e1f1585e3215766af3ca0a62b /src/burn/test/BurnUnitTest/RegistrationTest.cpp
parentc1694843f7c54c7f9feb3f7074a31ff8499c9644 (diff)
downloadwix-8c9ca787bee29f969cd7ca9aeaa46626d557d196.tar.gz
wix-8c9ca787bee29f969cd7ca9aeaa46626d557d196.tar.bz2
wix-8c9ca787bee29f969cd7ca9aeaa46626d557d196.zip
Add WixBundleCommandLineAction, don't set dynamic variables at startup.
Fixes 6736
Diffstat (limited to 'src/burn/test/BurnUnitTest/RegistrationTest.cpp')
-rw-r--r--src/burn/test/BurnUnitTest/RegistrationTest.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/burn/test/BurnUnitTest/RegistrationTest.cpp b/src/burn/test/BurnUnitTest/RegistrationTest.cpp
index 86ea86b0..f01d92a4 100644
--- a/src/burn/test/BurnUnitTest/RegistrationTest.cpp
+++ b/src/burn/test/BurnUnitTest/RegistrationTest.cpp
@@ -313,6 +313,9 @@ namespace Bootstrapper
313 plan.pCommand = &command; 313 plan.pCommand = &command;
314 plan.pInternalCommand = &internalCommand; 314 plan.pInternalCommand = &internalCommand;
315 315
316 hr = RegistrationSetVariables(&registration, &variables);
317 TestThrowOnFailure(hr, L"Failed to set registration variables.");
318
316 hr = PlanSetResumeCommand(&plan, &registration, &logging); 319 hr = PlanSetResumeCommand(&plan, &registration, &logging);
317 TestThrowOnFailure(hr, L"Failed to set registration resume command."); 320 TestThrowOnFailure(hr, L"Failed to set registration resume command.");
318 321
@@ -339,8 +342,8 @@ namespace Bootstrapper
339 this->ValidateUninstallKeyDisplayName(L"Product1"); 342 this->ValidateUninstallKeyDisplayName(L"Product1");
340 registration.detectedRegistrationType = BOOTSTRAPPER_REGISTRATION_TYPE_FULL; 343 registration.detectedRegistrationType = BOOTSTRAPPER_REGISTRATION_TYPE_FULL;
341 344
342 hr = RegistrationSetVariables(&registration, &variables); 345 hr = RegistrationSetDynamicVariables(&registration, &variables);
343 TestThrowOnFailure(hr, L"Failed to set registration variables."); 346 TestThrowOnFailure(hr, L"Failed to set dynamic registration variables.");
344 347
345 Assert::Equal(1ll, VariableGetNumericHelper(&variables, BURN_BUNDLE_INSTALLED)); 348 Assert::Equal(1ll, VariableGetNumericHelper(&variables, BURN_BUNDLE_INSTALLED));
346 Assert::Equal<String^>(gcnew String(L"foo"), VariableGetStringHelper(&variables, BURN_BUNDLE_TAG)); 349 Assert::Equal<String^>(gcnew String(L"foo"), VariableGetStringHelper(&variables, BURN_BUNDLE_TAG));