[PATCH] testbot: Only strip '.exe' from a test executable if it's a program.

Zebediah Figura z.figura12 at gmail.com
Wed May 2 20:18:27 CDT 2018


Otherwise we try to build dlls/ntoskrnl/Makefile etc. and fail.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 testbot/bin/WineRunBuild.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl
index 90c261b..af1bb1b 100755
--- a/testbot/bin/WineRunBuild.pl
+++ b/testbot/bin/WineRunBuild.pl
@@ -332,7 +332,10 @@ foreach my $OtherStep (@{$Job->Steps->GetItems()})
   if ($OtherFileName =~ m/^([\w_.]+)_test(?:64)?\.exe$/)
   {
     my $OtherBaseName = $1;
-    $OtherBaseName =~ s/\.exe$//;
+    if ($OtherStep->FileType eq "patchprograms")
+    {
+      $OtherBaseName =~ s/\.exe$//;
+    }
     if (defined $BaseName and $BaseName ne $OtherBaseName)
     {
       FatalError("$OtherBaseName doesn't match previously found $BaseName\n");
-- 
2.7.4




More information about the wine-devel mailing list