aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2019-11-01 19:24:45 -0400
committerBob Arnson <bob@firegiant.com>2019-11-01 19:38:13 -0400
commit34e002b3a9043ff3062c676c74fb124b5feef784 (patch)
treec1c1085d8075dc8f0acb9c4db298cff21925e153 /src/test
parent16ebbac306cebd4c5044ed89086c920e1bf6fae4 (diff)
downloadwix-34e002b3a9043ff3062c676c74fb124b5feef784.tar.gz
wix-34e002b3a9043ff3062c676c74fb124b5feef784.tar.bz2
wix-34e002b3a9043ff3062c676c74fb124b5feef784.zip
Fix error checking on CustomAction/@Error.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs1
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index 7f06eea6..7c3dddd7 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -281,6 +281,7 @@ namespace WixToolsetTest.CoreIntegration
281 { 281 {
282 "Binary:Binary1\t[Binary data]", 282 "Binary:Binary1\t[Binary data]",
283 "CustomAction:CustomAction1\t1\tBinary1\tInvalidEntryPoint\t", 283 "CustomAction:CustomAction1\t1\tBinary1\tInvalidEntryPoint\t",
284 "CustomAction:DiscardOptimismAllBeingsWhoProceed\t19\t\tAbandon hope all ye who enter here.\t",
284 }, results); 285 }, results);
285 } 286 }
286 } 287 }
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
index d9633869..e4b066e9 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
@@ -7,5 +7,6 @@
7 7
8 <Binary Id="Binary1" SourceFile="test.txt"></Binary> 8 <Binary Id="Binary1" SourceFile="test.txt"></Binary>
9 <CustomAction Id="CustomAction1" BinaryKey="Binary1" DllEntry="InvalidEntryPoint"></CustomAction> 9 <CustomAction Id="CustomAction1" BinaryKey="Binary1" DllEntry="InvalidEntryPoint"></CustomAction>
10 <CustomAction Id="DiscardOptimismAllBeingsWhoProceed" Error="Abandon hope all ye who enter here." />
10 </Fragment> 11 </Fragment>
11</Wix> 12</Wix>