Zebediah Figura : testbot: Only strip '.exe' from a test executable if it' s a program.
Alexandre Julliard
julliard at winehq.org
Mon May 7 16:32:44 CDT 2018
Module: tools
Branch: master
Commit: d5ba29fd52d8dfbef0fb8ca27152cc97c893abcf
URL: https://source.winehq.org/git/tools.git/?a=commit;h=d5ba29fd52d8dfbef0fb8ca27152cc97c893abcf
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Sat May 5 02:00:28 2018 +0200
testbot: Only strip '.exe' from a test executable if it's a program.
Otherwise we try to build dlls/ntoskrnl/Makefile etc. and fail.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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..3a52dbd 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");
More information about the wine-cvs
mailing list