aboutsummaryrefslogtreecommitdiff
path: root/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-07-17 15:22:14 -0700
committerRob Mensching <rob@firegiant.com>2020-07-17 15:27:13 -0700
commit6b21265e139513c1a242d8677b154fcc0e1dc7ef (patch)
tree7520da432e1fd2a8dc3c6de7f601bcfd632692f1 /src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
parentc37f29a156a84e27e6b38a7841e2ddcde015b071 (diff)
downloadwix-6b21265e139513c1a242d8677b154fcc0e1dc7ef.tar.gz
wix-6b21265e139513c1a242d8677b154fcc0e1dc7ef.tar.bz2
wix-6b21265e139513c1a242d8677b154fcc0e1dc7ef.zip
Ensure named bindpaths are not found in unnamed bindpaths
Fixes wixtoolset/issues#6200
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs30
1 files changed, 0 insertions, 30 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
index a60169c7..6ae2c0b8 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
@@ -88,36 +88,6 @@ namespace WixToolsetTest.CoreIntegration
88 } 88 }
89 } 89 }
90 90
91 [Fact(Skip = "Test demonstrates failure")]
92 public void CantBuildWixlibWithBinariesFromMissingNamedBindPaths()
93 {
94 var folder = TestData.Get(@"TestData\WixlibWithBinaries");
95
96 using (var fs = new DisposableFileSystem())
97 {
98 var baseFolder = fs.GetFolder();
99 var intermediateFolder = Path.Combine(baseFolder, "obj");
100 var wixlibPath = Path.Combine(intermediateFolder, @"test.wixlib");
101
102 var result = WixRunner.Execute(new[]
103 {
104 "build",
105 Path.Combine(folder, "PackageComponents.wxs"),
106 "-bf",
107 "-bindpath", Path.Combine(folder, "data"),
108 // Use names that aren't excluded in default .gitignores.
109 "-bindpath", $"AlphaBits={Path.Combine(folder, "data", "alpha")}",
110 "-bindpath", $"PowerBits={Path.Combine(folder, "data", "powerpc")}",
111 "-bindpath", $"{Path.Combine(folder, "data", "alpha")}",
112 "-bindpath", $"{Path.Combine(folder, "data", "powerpc")}",
113 "-intermediateFolder", intermediateFolder,
114 "-o", wixlibPath,
115 });
116
117 Assert.InRange(result.ExitCode, 2, int.MaxValue);
118 }
119 }
120
121 [Fact] 91 [Fact]
122 public void CanBuildSingleFileUsingWixlib() 92 public void CanBuildSingleFileUsingWixlib()
123 { 93 {