Module: tools
Branch: master
Commit: 66f29765bdcdbb3ff894a67037155b68c20473d2
URL: http://source.winehq.org/git/tools.git/?a=commit;h=66f29765bdcdbb3ff894a670…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Tue Apr 18 12:37:35 2017 +0200
winetest: Merge $datadir and $queuedir into $workdir.
There is no reason for them not to hang off the same directory
and it was already hardcoded that way in many places.
$workdir replaces $root with a more descriptive name. It also matches
winetest.cron.
The scripts also use relative paths which makes it easier to not leak
them in error messages.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
winetest/INSTALL.txt | 2 +-
winetest/build-index | 27 +++++++++++++++------------
winetest/dissect | 22 ++++++++++++----------
winetest/gather | 39 +++++++++++++++++++++------------------
winetest/winetest.cgi | 6 +++---
winetest/winetest.conf | 5 +----
6 files changed, 53 insertions(+), 48 deletions(-)
Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=66f29765bdcdbb3ff894…
Module: tools
Branch: master
Commit: 4c80ab399a94abc30ac02ccae8486af03039cbc8
URL: http://source.winehq.org/git/tools.git/?a=commit;h=4c80ab399a94abc30ac02cca…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Tue Apr 18 12:16:48 2017 +0200
testbot/WineRunTask: Improve some error messages.
These error messages are shown separately from the place where the error
is so it is important to provide context.
Also always start with the dll and test unit for consistency.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
testbot/bin/WineRunTask.pl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index cb12777..8b9afab 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -478,7 +478,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName))
my ($Dll, $Unit) = ($1, $2);
if ($CurrentDll ne "")
{
- LogTaskError("The done line is missing for $CurrentDll:$CurrentUnit\n");
+ LogTaskError("$CurrentDll:$CurrentUnit has no done line\n");
$LogFailures++;
}
($CurrentDll, $CurrentUnit) = ($Dll, $Unit);
@@ -549,7 +549,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName))
$CurrentIsPolluted = 1;
if ($IsWineTest and ($Todo or $Failures))
{
- LogTaskError("Found a misplaced '$Unit' test summary line.\n");
+ LogTaskError("$CurrentDll:$CurrentUnit contains a misplaced test summary line for $Unit\n");
$LogFailures++;
}
}
@@ -560,7 +560,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName))
if ($IsWineTest and ($Dll ne $CurrentDll or $Unit ne $CurrentUnit))
{
- LogTaskError("The start line is missing for $Dll:$Unit\n");
+ LogTaskError("$Dll:$Unit had no start line\n");
$LogFailures++;
$CurrentIsPolluted = 1;
}