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

[Zebediah Figura]

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

Signed-off-by: Zebediah Figura <z.figura12(a)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

[Zebediah Figura]

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

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---

Fixed to check $Step->FileType rather than $OtherStep->FileType. $Step 
refers to the build step which is the one with the "patchprograms" type. 
The others are usually "exe32" or "exe64" steps.

One can also peruse the new .exe 'dll' test patch in the Wine 
TestBot Suite for testing:
https://github.com/fgouget/wine/commit/d08e8eda5b4c3b690a46c567294a4b2da9e45...

Thanks for the patch!

~~ Francois Gouget


 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 90c261b08..3a52dbd04 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 ($Step->FileType eq "patchprograms")
+    {
+      $OtherBaseName =~ s/\.exe$//;
+    }
     if (defined $BaseName and $BaseName ne $OtherBaseName)
     {
       FatalError("$OtherBaseName doesn't match previously found $BaseName\n");
-- 
2.17.0