aboutsummaryrefslogtreecommitdiff
path: root/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
diff options
context:
space:
mode:
authorAndrij Abyzov <aabyzov@slb.com>2021-03-04 00:43:32 +0100
committerRob Mensching <rob@firegiant.com>2021-03-05 07:38:37 -0800
commit722ffb41bb83879d3e086b6faffd45ee38c5a5b6 (patch)
tree5c4a3f6170b7bcedff029423533d66e02e0ed6e4 /src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
parent816bfd180f132a9b07aaa573f5ac0f5948195764 (diff)
downloadwix-722ffb41bb83879d3e086b6faffd45ee38c5a5b6.tar.gz
wix-722ffb41bb83879d3e086b6faffd45ee38c5a5b6.tar.bz2
wix-722ffb41bb83879d3e086b6faffd45ee38c5a5b6.zip
Create unit test for WixVariable resolution issue #6376
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs57
1 files changed, 57 insertions, 0 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
index 6ae2c0b8..52460843 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
@@ -144,6 +144,63 @@ namespace WixToolsetTest.CoreIntegration
144 } 144 }
145 } 145 }
146 146
147 [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6376")]
148 public void CanOverridePathWixVariable()
149 {
150 var folder = TestData.Get(@"TestData\WixVariableOverride");
151
152 using (var fs = new DisposableFileSystem())
153 {
154 var baseFolder = fs.GetFolder();
155 var intermediateFolder = Path.Combine(baseFolder, "obj");
156 var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
157
158 var result = WixRunner.Execute(new[]
159 {
160 "build",
161 Path.Combine(folder, "PackageComponents.wxs"),
162 "-bf",
163 "-bindpath", Path.Combine(folder, "data"),
164 "-intermediateFolder", intermediateFolder,
165 "-o", wixlibPath,
166 });
167
168 result.AssertSuccess();
169
170 var wixlib = Intermediate.Load(wixlibPath);
171
172 Assert.True(wixlib.HasLevel(IntermediateLevels.Compiled));
173 Assert.True(wixlib.HasLevel(IntermediateLevels.Combined));
174 Assert.False(wixlib.HasLevel(IntermediateLevels.Linked));
175 Assert.False(wixlib.HasLevel(IntermediateLevels.Resolved));
176
177 result = WixRunner.Execute(new[]
178 {
179 "build",
180 Path.Combine(folder, "Package.wxs"),
181 "-loc", Path.Combine(folder, "Package.en-us.wxl"),
182 "-lib", Path.Combine(intermediateFolder, @"test.wixlib"),
183 "-bindpath", Path.Combine(folder, "data"),
184 "-intermediateFolder", intermediateFolder,
185 "-o", Path.Combine(baseFolder, @"bin\test.msi")
186 });
187
188 result.AssertSuccess();
189
190 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
191
192 Assert.False(intermediate.HasLevel(IntermediateLevels.Compiled));
193 Assert.False(intermediate.HasLevel(IntermediateLevels.Combined));
194 Assert.True(intermediate.HasLevel(IntermediateLevels.Linked));
195 Assert.True(intermediate.HasLevel(IntermediateLevels.Resolved));
196
197 var section = intermediate.Sections.Single();
198
199 var wixFile = section.Symbols.OfType<BinarySymbol>().First();
200 Assert.Equal(Path.Combine(folder, @"data\test2.txt"), wixFile.Data.Path);
201 }
202 }
203
147 [Fact] 204 [Fact]
148 public void CanBuildWithExtensionUsingWixlib() 205 public void CanBuildWithExtensionUsingWixlib()
149 { 206 {