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