From a6812c586928ce71d548f37e092cb3a98859ff1a Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 17 Jul 2019 16:19:37 -0500 Subject: [PATCH] Revert "More msi.plt retries for Jenkins builds on Windows" This reverts commit a69bd833fc6e29a145c7475c72bea85a32897385. --- src/ioc/dbtemplate/test/msi.plt | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/ioc/dbtemplate/test/msi.plt b/src/ioc/dbtemplate/test/msi.plt index f0d66565e..414e10961 100644 --- a/src/ioc/dbtemplate/test/msi.plt +++ b/src/ioc/dbtemplate/test/msi.plt @@ -33,16 +33,9 @@ ok(msi('-S../t6-substitute.txt ../t6-template.txt'), slurp('../t6-result.txt')); # Output option -o and verbose option -V my $out = 't7-output.txt'; -my $count = 5; # Try up to 5 times... -my $result; -do { - unlink $out; - msi("-I.. -V -o $out ../t1-template.txt"); - $result = slurp($out); - print "# msi output file empty, retrying\n" - if $result eq ''; -} while ($result eq '') && (--$count > 0); -ok($result, slurp('../t7-result.txt')); +unlink $out; +msi("-I.. -V -o $out ../t1-template.txt"); +ok(slurp($out), slurp('../t7-result.txt')); # Dependency generation, include/substitute model ok(msi('-I.. -D -o t8.txt ../t1-template.txt'), slurp('../t8-result.txt'));