aboutsummaryrefslogtreecommitdiff
path: root/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2020-03-26 13:51:14 -0400
committerBob Arnson <bob@firegiant.com>2020-03-26 15:14:33 -0400
commit1adfdda935b814541693cd550bb34fdbf2942b1f (patch)
tree72b815664870bd37b9c049faa102348cc872fdd9 /src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
parent22c97adba70fa838b8f285d404750d0f8fe685d8 (diff)
downloadwix-1adfdda935b814541693cd550bb34fdbf2942b1f.tar.gz
wix-1adfdda935b814541693cd550bb34fdbf2942b1f.tar.bz2
wix-1adfdda935b814541693cd550bb34fdbf2942b1f.zip
Add intermediate levels to track how IR has been lowered.
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
index a48a8370..5f8a278e 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
@@ -77,17 +77,25 @@ namespace WixToolsetTest.CoreIntegration
77 { 77 {
78 var baseFolder = fs.GetFolder(); 78 var baseFolder = fs.GetFolder();
79 var intermediateFolder = Path.Combine(baseFolder, "obj"); 79 var intermediateFolder = Path.Combine(baseFolder, "obj");
80 var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
80 81
81 var result = WixRunner.Execute(new[] 82 var result = WixRunner.Execute(new[]
82 { 83 {
83 "build", 84 "build",
84 Path.Combine(folder, "PackageComponents.wxs"), 85 Path.Combine(folder, "PackageComponents.wxs"),
85 "-intermediateFolder", intermediateFolder, 86 "-intermediateFolder", intermediateFolder,
86 "-o", Path.Combine(intermediateFolder, @"test.wixlib") 87 "-o", wixlibPath,
87 }); 88 });
88 89
89 result.AssertSuccess(); 90 result.AssertSuccess();
90 91
92 var wixlib = Intermediate.Load(wixlibPath);
93
94 Assert.True(wixlib.HasLevel(IntermediateLevels.Compiled));
95 Assert.True(wixlib.HasLevel(IntermediateLevels.Combined));
96 Assert.False(wixlib.HasLevel(IntermediateLevels.Linked));
97 Assert.False(wixlib.HasLevel(IntermediateLevels.Resolved));
98
91 result = WixRunner.Execute(new[] 99 result = WixRunner.Execute(new[]
92 { 100 {
93 "build", 101 "build",
@@ -102,6 +110,12 @@ namespace WixToolsetTest.CoreIntegration
102 result.AssertSuccess(); 110 result.AssertSuccess();
103 111
104 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); 112 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
113
114 Assert.False(intermediate.HasLevel(IntermediateLevels.Compiled));
115 Assert.False(intermediate.HasLevel(IntermediateLevels.Combined));
116 Assert.True(intermediate.HasLevel(IntermediateLevels.Linked));
117 Assert.True(intermediate.HasLevel(IntermediateLevels.Resolved));
118
105 var section = intermediate.Sections.Single(); 119 var section = intermediate.Sections.Single();
106 120
107 var wixFile = section.Tuples.OfType<FileTuple>().First(); 121 var wixFile = section.Tuples.OfType<FileTuple>().First();