aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-01-07 23:12:49 -0800
committerRob Mensching <rob@firegiant.com>2021-01-08 15:47:31 -0800
commite35ee2e8c58bf55da5f3d04915d588fb04d6809d (patch)
tree4bf0cfd782ec990b6a5d4ac9aec390d44dee097b /src/test
parent458ff7ce24b33f6df46ae8ef728685c555d55ff7 (diff)
downloadwix-e35ee2e8c58bf55da5f3d04915d588fb04d6809d.tar.gz
wix-e35ee2e8c58bf55da5f3d04915d588fb04d6809d.tar.bz2
wix-e35ee2e8c58bf55da5f3d04915d588fb04d6809d.zip
Report invalid command line arguments as errors
Fixes wixtoolset/issues#6313
Diffstat (limited to 'src/test')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs3
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs2
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs2
3 files changed, 3 insertions, 4 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs
index c5168856..62ffe1eb 100644
--- a/src/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs
@@ -48,7 +48,7 @@ namespace WixToolsetTest.CoreIntegration
48 } 48 }
49 } 49 }
50 50
51 [Fact(Skip = "Test demonstrates failure")] 51 [Fact]
52 public void CantBuildSingleExeBundleWithInvalidArgument() 52 public void CantBuildSingleExeBundleWithInvalidArgument()
53 { 53 {
54 var folder = TestData.Get(@"TestData"); 54 var folder = TestData.Get(@"TestData");
@@ -72,7 +72,6 @@ namespace WixToolsetTest.CoreIntegration
72 }); 72 });
73 73
74 Assert.NotEqual(0, result.ExitCode); 74 Assert.NotEqual(0, result.ExitCode);
75
76 Assert.False(File.Exists(exePath)); 75 Assert.False(File.Exists(exePath));
77 } 76 }
78 } 77 }
diff --git a/src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs b/src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs
index 4a5cf544..3ee88640 100644
--- a/src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs
@@ -216,7 +216,7 @@ namespace WixToolsetTest.CoreIntegration
216 result.AssertSuccess(); 216 result.AssertSuccess();
217 Assert.True(File.Exists(msiPath)); 217 Assert.True(File.Exists(msiPath));
218 218
219 result = WixRunner.Execute(new[] 219 result = WixRunner.Execute(false, new[]
220 { 220 {
221 "decompile", msiPath, 221 "decompile", msiPath,
222 "-intermediateFolder", intermediateFolder, 222 "-intermediateFolder", intermediateFolder,
diff --git a/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs b/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
index b07f5bda..924337ba 100644
--- a/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
@@ -20,7 +20,7 @@ namespace WixToolsetTest.CoreIntegration
20 var intermediateFolder = fs.GetFolder(); 20 var intermediateFolder = fs.GetFolder();
21 var outputPath = Path.Combine(intermediateFolder, @"Actual.wxs"); 21 var outputPath = Path.Combine(intermediateFolder, @"Actual.wxs");
22 22
23 var result = WixRunner.Execute(new[] 23 var result = WixRunner.Execute(false, new[]
24 { 24 {
25 "decompile", 25 "decompile",
26 Path.Combine(folder, msiName), 26 Path.Combine(folder, msiName),