wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

Francois Gouget : winetest/gather: Fix test_links() when the source file is unknown.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: tools Branch: master Commit: e5ba0061b8c9f192d8b647ffe7c99ff9e229036b URL: https://source.winehq.org/git/tools.git/?a=commit;h=e5ba0061b8c9f192d8b647f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 19 14:41:01 2021 +0100 winetest/gather: Fix test_links() when the source file is unknown. This can happen if a given test unit (or just its source field) is missing from a set of report summary files (e.g. from ReportTest). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 2 ++ 1 file changed, 2 insertions(+) diff --git a/winetest/gather b/winetest/gather index 31ba8fa..8948697 100755 --- a/winetest/gather +++ b/winetest/gather @@ -722,6 +722,8 @@ sub test_links($$) { my ($testname, $group) = @_; my $source = $alltests{$testname}; + return "<td></td>" if (!defined $source); + return "<td class=\"links\"><a href=\"$gitweb/?a=history;f=$source;hb=$build\" title=\"$source change history\">history</a>" . " | <a href=\"$gitweb/?a=blob;f=$source;hb=$build\" title=\"$source source code\">source</a>" . (defined($group) ? " | <a href=\"index.html#$testname\" title=\"summary of $testname results across platforms\">summary</a>" : "") .

1 0

Francois Gouget : winetest/dissect: Fix the 'failed' summary lines.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: tools Branch: master Commit: 5518b0e1133577f328e5ffd61aaefe86be06b7e9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5518b0e1133577f328e5ffd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 19 14:40:23 2021 +0100 winetest/dissect: Fix the 'failed' summary lines. The source must always be in the 8th field, not the 6th! So put placeholders to replace the failure and skip counts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 46b3921..fc83726 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -793,7 +793,7 @@ while ($line = <IN>) { if ($l_rc == 258) { add_test_line("end", "Test failed: timed out"); - $summary = "failed 258"; + $summary = "failed 258 - -"; $extra_failures++; $broken = 1; } @@ -803,7 +803,7 @@ while ($line = <IN>) { if ($l_rc & 0xc0000000) { add_test_line("end", sprintf("Test failed: crash (%08x)", $l_rc & 0xffffffff)); - $summary = "failed crash"; + $summary = "failed crash - -"; $extra_failures++; $broken = 1; } @@ -816,7 +816,7 @@ while ($line = <IN>) { elsif ($l_rc & 0xc0000000) { add_test_line("end", sprintf("Test failed: crash (%08x)", $l_rc & 0xffffffff)); - $summary = "failed crash"; + $summary = "failed crash - -"; $extra_failures++; $broken = 1; }

1 0

Francois Gouget : testbot/reporttest: Add more tests from the wtbsuite.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: tools Branch: master Commit: c7dd6b544792852396b5d6afd7f840cf077ea4d7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c7dd6b544792852396b5d6a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 19 01:43:05 2021 +0100 testbot/reporttest: Add more tests from the wtbsuite. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 75 ++++++++++++++++++++++++++++------ testbot/src/reporttest/report.testwtbs | 21 +++++++++- 2 files changed, 83 insertions(+), 13 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 9b28533..ef3dc7d 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -27,6 +27,7 @@ Dll info: bcrypt=dll is missing browseui=6.0.2900.5512 cabinet=5.1.2600.5512 + chcp.com=1.0 cmd.exe=5.1.2600.5512 combase=dll is missing comcat=5.0.2600.1 @@ -262,8 +263,7 @@ subprocess. advapi32:crypt_sha:08f8 done (3) in 0s advapi32:eventlog start dlls/advapi32/tests/eventlog.c - ------ WTBS Unreported test failures ------ A test unit with an unreported failed test +----- A test unit with an unreported failed test despite a non-zero exit code. ----- Expected assessement: 1 failure, "Unreported failure" error eventlog.c:20: Test failed: Something wrong 088c:eventlog: 408 tests executed (0 marked as todo, 0 failures), 0 skipped. @@ -319,7 +319,13 @@ advpack:install start dlls/advpack/tests/install.c - 07b0:install: unhandled exception c0000005 at 0040167C advpack:install:07b0 done (-1073741819) in 0s -stub amstream:amstream +amstream:amstream start dlls/amstream/tests/amstream.c - +----- WTBS Unreported test failures +----- A test unit with an unreported failed test +----- Expected assessement: 1 failure + "Unreported failure" error +amstream.c:20: Test failed: Something wrong +088c:amstream: 408 tests executed (0 marked as todo, 0 failures), 0 skipped. +amstream:amstream:088c done (0) in 4s apphelp:apphelp start dlls/apphelp/tests/apphelp.c - ----- WTBS Failure propagation from child processes @@ -336,8 +342,17 @@ apphelp.c:44: 2 failures in child process 0c9c:apphelp: 116 tests executed (0 marked as todo, 3 failures), 0 skipped. apphelp:apphelp:0c9c done (3) in 0s -stub atl:atl_ax -stub atl:module +atl:atl_ax start dlls/atl/tests/atl_ax.c - +----- WTBS Timeout after a test failure +----- Expected assessement: Timeout +atl_ax.c:20: Test failed: A failure before timing out +atl:atl_ax:0b14 done (258) in 120s + +atl:module start dlls/atl/tests/module.c - +----- WTBS Timeout after a subprocess +----- Expected assessement: Timeout +1234:module: 116 tests executed (0 marked as todo, 0 failures), 0 skipped. +atl:module:0b14 done (258) in 120s atl:registrar start dlls/atl/tests/registrar.c - ----- A test unit with a foreign test summary line @@ -378,6 +393,12 @@ fdi.c:42: Test marked todo: Hello Wine! 0690:fdi: 265 tests executed (1 marked as todo, 0 failures), 0 skipped. cabinet:fdi:0690 done (0) in 0s +chcp.com:chcp start programs/chcp.com/tests/chcp.c - +----- WTBS New .com program test directory +----- Expected assessement: Success +2021:chcp: 1 tests executed (0 marked as todo, 0 failures), 0 skipped. +chcp.com:chcp:2021 done (0) in 9s + cmd.exe:batch start programs/cmd/tests/batch.c - ----- A test unit with an unreported todo test ----- Expected assessement: "Unreported todo line" error @@ -485,7 +506,11 @@ security.c:42: Tests skipped: Another time ----- Keep this stub in case the previous test is mishandled stub comctl32:progress -stub comctl32:propsheet +comctl32:propsheet start dlls/comctl32/tests/propsheet.c - +----- WTBS Exit abruptly after a subprocess +----- Expected assessement: Missing summary line +1234:propsheet: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. +comctl32:propsheet:0148 done (0) in 9s comctl32:rebar start dlls/comctl32/tests/rebar.c - ----- A test unit with an unreported crash in a subprocess @@ -553,7 +578,14 @@ comctl32:toolbar start dlls/comctl32/tests/toolbar.c - ----- Expected assessement: crashed comctl32:toolbar done (-1073741819) in 0s -stub comctl32:tooltips +comctl32:tooltips start dlls/comctl32/tests/tooltips.c - +----- WTBS Timeout in a child process +----- The time out for child processes is normally shorter than for full test +----- units and the framework issues a test failure. +----- Expected assessement: 1 failure +tooltips.c:350: Test failed: Timed out waiting for the child process +0b14:tooltips: 3 tests executed (0 marked as todo, 1 failure), 0 skipped. +comctl32:tooltips:0b14 done (1) in 42s comctl32:trackbar start dlls/comctl32/tests/trackbar.c - ----- WTBS Test failures, todos and skips in a subtest @@ -567,12 +599,31 @@ driver.c:43: Tests skipped: Another time 07b1:trackbar: 3 tests executed (1 marked as todo, 2 failures), 1 skipped. comctl32:trackbar:07b1 done (2) in 0s -stub comctl32:treeview -stub comctl32:updown -stub comdlg32:filedlg +comctl32:treeview start dlls/comctl32/tests/treeview.c - +----- WTBS Unreported child process failure +----- Expected assessement: 2 failures (1+"Returned success despite failure") +treeview.c:40: Test failed: Unreported failure +01a9:treeview: 42 tests executed (0 marked as todo, 1 failures), 0 skipped. +01a8:treeview: 1 tests executed (0 marked as todo, 0 failures), 0 skipped. +comctl32:treeview:01a8 done (0) in 0s + +comctl32:updown start dlls/comctl32/tests/updown.c - +----- WTBS A misplaced test failure +----- Expected assessement: 2 failures (1+"Returned success despite failure") +vorlon.c:40: Test failed: Unreported failure +01a8:updown: 2 tests executed (0 marked as todo, 0 failures), 0 skipped. +comctl32:updown:01a8 done (0) in 0s + +comdlg32:filedlg start dlls/comdlg32/tests/filedlg.c - +----- WTBS A misplaced subtest line +----- Expected assessement: 1 failure +shadow.c:222: Subtest black +01a8:filedlg: 10 tests executed (0 marked as todo, 0 failures), 0 skipped. +comdlg32:filedlg:01a8 done (0) in 0s + stub comdlg32:finddlg -comctl32:fontdlg start dlls/comctl32/tests/fontdlg.c - +comdlg32:fontdlg start dlls/comdlg32/tests/fontdlg.c - ----- Check support for IgnoreExceptions ----- Expected assessement: 6 failures 01bd:fontdlg: unhandled exception c0000005 at 00001111 @@ -587,7 +638,7 @@ fontdlg.c:22: IgnoreExceptions=0 Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00003333). fontdlg.c:30: unhandled exception c0000005 in child process 3333 01bd:fontdlg: 10 tests executed (0 marked as todo, 6 failures), 0 skipped. -comctl32:fontdlg:01bd done (6) in 0s +comdlg32:fontdlg:01bd done (6) in 0s stub comdlg32:itemdlg stub comdlg32:printdlg diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index aa78c9e..27ca12f 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -13,7 +13,7 @@ with: ----- TestWTBS ----- -p tests.TestFailures 51 +p tests.TestFailures 64 p build.HasTask 0 a wine.log.GrepV ^Applying patch @@ -32,10 +32,18 @@ g 0 tests.report.advpack n 0 files.c:20: Test failed: A failure in the main process n 0 07b0:install: unhandled exception c0000005 at 0040167C +g 0 tests.report.amstream +n 0 amstream.c:20: Test failed: Something wrong + g 0 tests.report.apphelp n 0 apphelp.c:40: Test failed: A failure in the child process n 0 apphelp.c:41: Test succeeded inside todo block: Success in the child process +g 0 tests.report.atl +n 0 atl_ax.c:20: Test failed: A failure before timing out +n 0 atl_ax: Timeout +n 0 module: Timeout + g 0 tests.report.comctl32 n 0 animate: Timeout n 0 comboex.c:40: Test failed: A failure in the main process @@ -48,8 +56,13 @@ n 0 Do not cut syslink.c:41: Test succeeded inside todo block: Something right! n 0 Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x0054376d). n 0 1234:taskdialog: unhandled exception c0000005 at 0040167C n 0 taskdialog.c:471: unhandled exception c0000005 in child process 1234 +n 0 tooltips.c:350: Test failed: Timed out waiting for the child process n 0 driver.c:40: Test failed: Something wrong n 0 driver.c:41: Test succeeded inside todo block: Something right! +n 0 treeview.c:40: Test failed: Unreported failure +n 0 vorlon.c:40: Test failed: Unreported failure + +g 0 tests.report.comdlg32 n 0 01bd:fontdlg: unhandled exception c0000005 at 00001111 n 0 Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00001111). n 0 fontdlg.c:10: unhandled exception c0000005 in child process 1111 @@ -65,6 +78,8 @@ n 0 advapi32:eventlog has unaccounted for failure messages n 0 advapi32:lsa has no test summary line (early exit of the main process?) n 0 advapi32:registry has no test summary line (early exit of the main process?) n 0 advapi32:service returned success despite having failures +n 0 amstream:amstream has unaccounted for failure messages +n 0 amstream:amstream returned success despite having failures n 0 atl:registrar contains a misplaced test summary message for alien n 0 browseui:progressdlg has unaccounted for skip messages n 0 cabinet:extract is missing some skip messages @@ -76,8 +91,12 @@ n 0 comctl32:header returned success despite having failures n 0 comctl32:ipaddress has no done line (or it is garbled) n 0 comctl32:misc had no start line (or it is garbled) n 0 comctl32:monthcal contains a misplaced todo message for security +n 0 comctl32:propsheet has no test summary line (early exit of the main process?) n 0 comctl32:rebar returned success despite having failures n 0 comctl32:toolbar has no done line (or it is garbled) +n 0 comctl32:treeview returned success despite having failures +n 0 comctl32:updown contains a misplaced failure message for vorlon +n 0 shadow has a misplaced black subtest line n 0 xmllite:writer has unaccounted for failure messages n 0 xmllite:writer returned success despite having failures ----- TestWTBS -----

1 0

Francois Gouget : winetest/dissect: Report misplaced IgnoreExceptions directives.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: tools Branch: master Commit: e816030854be41d33c8e33b83d3564cb81b95514 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e816030854be41d33c8e33b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 19 01:42:41 2021 +0100 winetest/dissect: Report misplaced IgnoreExceptions directives. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 1 + 1 file changed, 1 insertion(+) diff --git a/winetest/dissect b/winetest/dissect index 4ad98d1..46b3921 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -664,6 +664,7 @@ while ($line = <IN>) { add_test_line("", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); + check_unit($l_unit, "IgnoreExceptions"); $ignore_exceptions = $l_ignore; } elsif (($unit ne "" and

1 0

Francois Gouget : winetest/dissect: Stop get_source_link() from interfering with check_unit().
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: tools Branch: master Commit: 574d4acf228efc4b7f404568c20d3767eb50ac2a URL: https://source.winehq.org/git/tools.git/?a=commit;h=574d4acf228efc4b7f40456… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 19 01:42:26 2021 +0100 winetest/dissect: Stop get_source_link() from interfering with check_unit(). When calling get_source_link() before check_unit(), setting $broken causes check_unit() to think the misplaced test unit issue has already been reported. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 4f15bdd..4ad98d1 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -454,16 +454,11 @@ my ($extra_failures, $failed_units) = (0, 0); sub get_source_link($$) { my ($_unit, $_lnum) = @_; + # Let the caller check $_unit to not interfere with check_unit() my $source_link = defined $_unit ? "$_unit.c" : $source ne "-" ? $source : "$dll:$unit"; $source_link .= ":$_lnum" if (defined $_lnum); - if (defined $_unit and !$units{$_unit}) - { - # If the line is not for a current test unit we'll let its - # developer hash it out with the polluter ;-) - $broken = 1; - } - elsif ($source ne "-") + if ($source ne "-") { my $url = "$gitweb/?a=blob;f=$source;hb=$testbuild"; $url .= "#l$_lnum" if (defined $_lnum);

1 0

Francois Gouget : testbot/LogUtils: Tweak the child process exception test unit regexp.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: tools Branch: master Commit: 6665ad63037c231fdeb64181e749efacfc5a0f76 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6665ad63037c231fdeb6418… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 19 01:42:08 2021 +0100 testbot/LogUtils: Tweak the child process exception test unit regexp. It should have the same structure in _GetLineKey() as the rest of the test unit filename regular expressions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index bbc0f47..dae8292 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1144,7 +1144,7 @@ sub _GetLineKey($) # or the process id in Wine's exc_filter() lines or $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8} at )[0-9a-fA-F]{8,16}$/$1/ # or child process id - or $Line =~ s/^([_.a-z0-9]+:)\d+:( unhandled exception [0-9a-fA-F]{8} in child process )[0-9a-fA-F]{4}$/$1$2/ + or $Line =~ s/^([_a-z0-9]+\.c:)\d+:( unhandled exception [0-9a-fA-F]{8} in child process )[0-9a-fA-F]{4}$/$1$2/ # The exact amount of data printed does not change the error or $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$\d+ bytes$$/$1/;

1 0

Francois Gouget : testbot/LogUtils: Fix the unhandled exception in child process handling.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: tools Branch: master Commit: 0d0e66b8c8d55c088c0f5e81014e429d6298a1ea URL: https://source.winehq.org/git/tools.git/?a=commit;h=0d0e66b8c8d55c088c0f5e8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 19 01:40:08 2021 +0100 testbot/LogUtils: Fix the unhandled exception in child process handling. The filename extension is not part of the test unit name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 7bd4d31..bbc0f47 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -639,8 +639,8 @@ sub ParseWineTestReport($$$) $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and - $Line =~ /($Cur->{UnitsRE}):\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) or - $Line =~ /^([_.a-z0-9]+):\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) + $Line =~ /($Cur->{UnitsRE})\.c:\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) or + $Line =~ /^([_.a-z0-9]+)\.c:\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) { my ($Unit, $Pid) = ($1, $2); if ($Cur->{Units}->{$Unit})

1 0

Francois Gouget : testbot/LogUtils: Remove line numbers from some make errors.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: tools Branch: master Commit: 644b230916f5029402f71213730e62eba7bd764f URL: https://source.winehq.org/git/tools.git/?a=commit;h=644b230916f5029402f7121… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 19 01:39:30 2021 +0100 testbot/LogUtils: Remove line numbers from some make errors. We would presumably not routinely have compilation errors so this is not really needed for the normal TestBot operation. But this allows TestWTBS to check the presence of expected compilation errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 2cb2ad2..7bd4d31 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1137,6 +1137,7 @@ sub _GetLineKey($) # Remove the line number $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block):)/$1$2/ + or $Line =~ s/^([._a-zA-Z0-9-]+:)\d+(: recipe for target )/$1$2/ # Remove the crash code address: it changes whenever the test is recompiled or $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/

1 0

Francois Gouget : winetest: Make sure the cron script releases the lock once done.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: tools Branch: master Commit: b13e278b0a85ae8be08f55dcf66c16651dcf02a9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b13e278b0a85ae8be08f55d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 19 01:37:03 2021 +0100 winetest: Make sure the cron script releases the lock once done. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/winetest.cron | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/winetest/winetest.cron b/winetest/winetest.cron index 7418f9e..6119013 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -31,6 +31,10 @@ then exit 1 fi lock="/tmp/winetest.lock" +cleanup() +{ + rm -f "$lock" +} # expiration age (in days) before results get archived expire=120 @@ -38,6 +42,7 @@ expire=120 if [ ! -f "$lock" ] then touch "$lock" + trap cleanup EXIT cd "$workdir" refresh_index="" @@ -87,6 +92,4 @@ then # remove old queue files find queue -maxdepth 1 -mtime +30 -name "err*" -print0 | xargs -0 rm -rf find queue -maxdepth 1 -mtime +30 -name "CGI*" -print0 | xargs -0 rm -f - - rm "$lock" fi

1 0

Francois Gouget : winetest/dissect: Tweak a couple of add_test_line() messages.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: tools Branch: master Commit: b0f16dd278106a5a515fb01daf685ca1faecb350 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b0f16dd278106a5a515fb01… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 19 01:36:48 2021 +0100 winetest/dissect: Tweak a couple of add_test_line() messages. They should have no trailing linefeed or full stop. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 4341999..4f15bdd 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -485,7 +485,7 @@ sub check_unit($$) my ($l_unit, $l_type) = @_; if (!$units{$l_unit} and !$broken) { - add_test_line("end", "Misplaced $l_type message\n"); + add_test_line("end", "Misplaced $l_type message"); $extra_failures++; $broken = 1; } @@ -608,7 +608,7 @@ while ($line = <IN>) { $testbox = create_test_unit_box(); if ($l_type eq "skipped") { - add_test_line("skipped", "Skipped by user request."); + add_test_line("skipped", "Skipped by user request"); print SUM "- $dll $unit skipped - - - $source $rev\n"; mydie "too many test units skipped by user request (>$maxuserskips at $dll:$unit)" if ++$skipped_units > $maxuserskips; $rc = 0;

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2021