Francois Gouget : testbot: Use 'dir.exe' as the module name for programs.
Alexandre Julliard
julliard at winehq.org
Thu Jul 12 10:45:29 CDT 2018
Module: tools
Branch: master
Commit: 1b4f57822da483166100d652f338195d633d1cf6
URL: https://source.winehq.org/git/tools.git/?a=commit;h=1b4f57822da483166100d652f338195d633d1cf6
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Thu Jul 12 16:55:53 2018 +0200
testbot: Use 'dir.exe' as the module name for programs.
For programs one identifies test units as dir.exe:unit, So 'dir.exe' is
what should be used for the Module field.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/lib/WineTestBot/PatchUtils.pm | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm
index 811c3b8..be5ce14 100644
--- a/testbot/lib/WineTestBot/PatchUtils.pm
+++ b/testbot/lib/WineTestBot/PatchUtils.pm
@@ -127,11 +127,12 @@ sub _LoadWineFiles()
chomp $Line;
$_WineFiles->{$Line} = 1;
- if ($Line =~ m~^\w+/([^/]+)/tests/([^/]+)$~)
+ if ($Line =~ m~^(dlls|programs)/([^/]+)/tests/([^/]+)$~)
{
- my ($Module, $File) = ($1, $2);
+ my ($Root, $Module, $File) = ($1, $2, $3);
next if ($File eq "testlist.c");
next if ($File !~ /\.(?:c|spec)$/);
+ $Module .= ".exe" if ($Root eq "programs");
$_TestList->{$Module}->{$File} = 1;
}
}
@@ -156,19 +157,18 @@ sub _HandleFile($$$)
if ($FilePath =~ m~^(dlls|programs)/([^/]+)/tests/([^/\s]+)$~)
{
- my ($Root, $Module, $File) = ($1, $2, $3);
+ my ($Root, $Dir, $File) = ($1, $2, $3);
$Impacts->{IsWinePatch} = 1;
$Impacts->{TestBuild} = 1;
my $Tests = $Impacts->{Tests};
+ my $Module = ($Root eq "programs") ? "$Dir.exe" : $Dir;
if (!$Tests->{$Module})
{
- my $ExeBase = ($Root eq "programs") ? "${Module}.exe_test" :
- "${Module}_test";
$Tests->{$Module} = {
"Module" => $Module,
- "Path" => "$Root/$Module/tests",
- "ExeBase" => $ExeBase,
+ "Path" => "$Root/$Dir/tests",
+ "ExeBase" => "${Module}_test",
};
}
More information about the wine-cvs
mailing list