diff options
author | Rob Mensching <rob@firegiant.com> | 2017-11-11 01:45:59 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2017-11-11 01:45:59 -0800 |
commit | 9f8cb5374481b6c8a06eb2739858332350f72666 (patch) | |
tree | 4b09b90d8a516cb5e7d8203759bd2489b6a5d20c /src/test | |
parent | 2bb37beda887d120a0ddabf874ad25357101faa1 (diff) | |
download | wix-9f8cb5374481b6c8a06eb2739858332350f72666.tar.gz wix-9f8cb5374481b6c8a06eb2739858332350f72666.tar.bz2 wix-9f8cb5374481b6c8a06eb2739858332350f72666.zip |
Additional IR updates
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs b/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs index 46d15ed8..4b4daeda 100644 --- a/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs | |||
@@ -26,18 +26,17 @@ namespace WixToolsetTest.CoreIntegrationFixture | |||
26 | var result = program.Run(new WixToolsetServiceProvider(), new[] { "build", "Package.wxs", "PackageComponents.wxs", "-loc", "Package.en-us.wxl", "-bindpath", "data", "-intermediateFolder", intermediateFolder, "-o", $@"{intermediateFolder}\bin\test.msi" }); | 26 | var result = program.Run(new WixToolsetServiceProvider(), new[] { "build", "Package.wxs", "PackageComponents.wxs", "-loc", "Package.en-us.wxl", "-bindpath", "data", "-intermediateFolder", intermediateFolder, "-o", $@"{intermediateFolder}\bin\test.msi" }); |
27 | 27 | ||
28 | Assert.Equal(0, result); | 28 | Assert.Equal(0, result); |
29 | #if FIXED_MSI_BACKEND | 29 | |
30 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msi"))); | 30 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msi"))); |
31 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb"))); | 31 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb"))); |
32 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\MsiPackage\test.txt"))); | 32 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\MsiPackage\test.txt"))); |
33 | #else | 33 | |
34 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.msi")); | 34 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wir")); |
35 | Assert.Single(intermediate.Sections); | 35 | Assert.Single(intermediate.Sections); |
36 | 36 | ||
37 | var wixFile = intermediate.Sections.SelectMany(s => s.Tuples).OfType<WixFileTuple>().Single(); | 37 | var wixFile = intermediate.Sections.SelectMany(s => s.Tuples).OfType<WixFileTuple>().Single(); |
38 | Assert.Equal(@"data\test.txt", wixFile[WixFileTupleFields.Source].AsPath().Path); | 38 | Assert.Equal(@"data\test.txt", wixFile[WixFileTupleFields.Source].AsPath().Path); |
39 | Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path); | 39 | Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path); |
40 | #endif | ||
41 | } | 40 | } |
42 | } | 41 | } |
43 | } | 42 | } |