April 2017 - Wine-commits - list.winehq.org

Francois Gouget : testbot/WineRunTask: Improve some error messages.
by Alexandre Julliard 19 Apr '17

19 Apr '17

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; }

1 0

Francois Gouget : winetest: Merge $datadir and $queuedir into $workdir.
by Alexandre Julliard 19 Apr '17

19 Apr '17

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…

1 0

Francois Gouget : testbot/reporttest: Fix the comctl32: ipaddress start line.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: tools Branch: master Commit: 176af432dfa19710dc0861292b85d87e47755ba5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=176af432dfa19710dc086129… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 18 09:30:41 2017 +0200 testbot/reporttest: Fix the comctl32:ipaddress start line. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index d66b829..8619fbf 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -437,7 +437,7 @@ TestLauncher does not set the source filename field. 0998:imagelist: 16 tests executed (0 marked as todo, 0 failure), 0 skipped. comctl32:imagelist:0998 done (0) in 0s -comctl32:ipaddress dlls/comctl32/tests/ipaddress.c - +comctl32:ipaddress start dlls/comctl32/tests/ipaddress.c - ----- A unit test with a missing done line ----- Expected assessement: "Missing done line" error Issued upon seeing the next start line.

1 0

Francois Gouget : testbot/reporttest: Adjust some comments.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: tools Branch: master Commit: 055a589341250fd6248443a19916917b6010ba57 URL: http://source.winehq.org/git/tools.git/?a=commit;h=055a589341250fd6248443a1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 18 09:31:18 2017 +0200 testbot/reporttest: Adjust some comments. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 8619fbf..148456b 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -300,7 +300,7 @@ advpack:advpack start dlls/advpack/tests/advpack.c - advpack:advpack:0da0 done (0) in 0s advpack:files start dlls/advpack/tests/files.c - ------ A unit test with a failed test in the main process +----- A unit test with a failed test in the main process before a subprocess ----- Expected assessement: 1 failure files.c:20: Test failed: A failure in the main process 4321:files: 99 tests executed (0 marked as todo, 0 failures), 0 skipped. @@ -394,9 +394,9 @@ comctl32:animate start dlls/comctl32/tests/animate.c - ----- Expected assessement: Timeout comctl32:animate:0b14 done (258) in 42s ------ Skipping a test unit by user ------ Expected assessement: Skipped by user comctl32:button skipped dlls/comctl32/tests/button.c - +----- Skipping a test unit by user request +----- Expected assessement: Skipped by user comctl32:comboex start dlls/comctl32/tests/comboex.c - ----- A unit test with failed, todo and skipped tests in the main process @@ -424,7 +424,7 @@ comctl32:dpa:0998 done (1) in 0s comctl32:header start dlls/comctl32/tests/header.c - ----- A unit test with a zero exit code despite failures ------ Expected assessement: "Zero exit code" error +----- Expected assessement: 1 failure, "Zero exit code" error A non-zero exit code is necessary for 'make test'. header.c:1: Test failed: Something wrong 0998:header: 16 tests executed (0 marked as todo, 1 failure), 0 skipped. @@ -452,7 +452,7 @@ comctl32:misc:0998 done (0) in 0s comctl32:monthcal start dlls/comctl32/tests/monthcal.c - ----- A unit test with a misplaced todo subprocess test summary line ------ Expected assessement: "Misplaced summary line" error +----- Expected assessement: 1 todo, "Misplaced summary line" error See the previous misplaced test summary line scenarios. 0148:monthcal: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. comctl32:monthcal:0148 done (0) in 9s

1 0

Francois Gouget : testbot/reporttest: Merge the garbled test message tests.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: tools Branch: master Commit: 569eb2b5eca5e1cac217a48677046314538eb9db URL: http://source.winehq.org/git/tools.git/?a=commit;h=569eb2b5eca5e1cac217a486… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 18 09:31:32 2017 +0200 testbot/reporttest: Merge the garbled test message tests. Extend it to all types of test messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 148456b..fcb3e59 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -517,23 +517,23 @@ subclass: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. comctl32:subclass:07b0 done (1) in 0s comctl32:syslink start dlls/comctl32/tests/syslink.c - ------ A unit test with a garbled test failed line ------ Expected assessement: 1 failure +----- A unit test with garbled test lines +----- Expected assessement: 2 failures, 1 todo, 1 skip Multi-threaded and multi-process tests should really try to avoid races in the report. But analysis tools should also try to be resilient. Do not cut syslink.c:40: Test failed: Something wrong me off -07b0:syslink: 2251 tests executed (0 marked as todo, 1 failures), 0 skipped. -comctl32:syslink:07b0 done (1) in 0s - -comctl32:tab start dlls/comctl32/tests/tab.c - ------ A unit test with a garbled test summary line ------ Expected assessement: Success -See previous comment. -Do not cut 07b0:tab: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. +Do not cut syslink.c:41: Test succeeded inside todo block: Something right! +me off +Do not cut syslink.c:42: Test marked todo: Hello Wine! +me off +Do not cut syslink.c:43: Tests skipped: Another time +me off +Do not cut 07b0:syslink: 2251 tests executed (1 marked as todo, 2 failures), 1 skipped. me off -comctl32:tab:07b0 done (0) in 0s +comctl32:syslink:07b0 done (2) in 0s +stub comctl32:tab stub comctl32:toolbar stub comctl32:tooltips stub comctl32:trackbar

1 0

Francois Gouget : testbot/reporttest: Add unhandled exception tests.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: tools Branch: master Commit: cfccc4df499a67a247a7657ca7cc327072069805 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cfccc4df499a67a247a7657c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 18 09:31:46 2017 +0200 testbot/reporttest: Add unhandled exception tests. Test what happens when the exit code is reported as an unsigned integer like TestLauncher does. Also the process exit code should be sufficient for detecting a crash. This is needed for non-Wine test since they won't print an 'unhandled exception' line. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index fcb3e59..cfb6083 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -311,7 +311,7 @@ advpack:install start dlls/advpack/tests/install.c - ----- A unit test with a crash ----- Expected assessement: Crash 07b0:install: unhandled exception c0000005 at 0040167C -advpack:install:07b0 done (3221225477) in 0s +advpack:install:07b0 done (-1073741819) in 0s amstream:amstream start dlls/amstream/tests/amstream.c - ----- No pid at all @@ -533,9 +533,29 @@ Do not cut 07b0:syslink: 2251 tests executed (1 marked as todo, 2 failures), 1 s me off comctl32:syslink:07b0 done (2) in 0s -stub comctl32:tab -stub comctl32:toolbar -stub comctl32:tooltips +comctl32:tab start dlls/comctl32/tests/tab.c - +----- A unit test crash with no pid +----- Expected assessement: crashed +tab: unhandled exception c0000005 at 0040167C +comctl32:tab done (-1073741819) in 0s + +comctl32:taskdialog start dlls/comctl32/tests/taskdialog.c - +----- A unit test crash with unsigned exit code (TestLauncher) +----- Expected assessement: crashed +taskdialog: unhandled exception c0000005 at 0040167C +comctl32:taskdialog done (3221225477) in 0s + +comctl32:toolbar start dlls/comctl32/tests/toolbar.c - +----- A unit test crash with no unhandled exception line +----- Expected assessement: crashed +comctl32:toolbar done (-1073741819) in 0s + +comctl32:tooltips start dlls/comctl32/tests/toolbar.c - +----- A unit test crash with no unhandled exception line +----- and an unsigned exit code. +----- Expected assessement: crashed +comctl32:tooltips done (3221225477) in 0s + stub comctl32:trackbar stub comctl32:treeview stub comctl32:updown

1 0

Francois Gouget : testbot/reporttest: Fix the failed/todo/ skipped message test.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: tools Branch: master Commit: 48d415aa68ef49ef4b936949261d5c754022efd3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=48d415aa68ef49ef4b936949… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 18 09:33:11 2017 +0200 testbot/reporttest: Fix the failed/todo/skipped message test. The unit on those lines was wrong. Added a 'succeeded inside todo block' line. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index cfb6083..1eb3724 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -400,14 +400,15 @@ comctl32:button skipped dlls/comctl32/tests/button.c - comctl32:comboex start dlls/comctl32/tests/comboex.c - ----- A unit test with failed, todo and skipped tests in the main process ------ Expected assessement: 1 failure, 1 todo, 1 skip -advpack.c:40: Test failed: A failure in the main process -advpack.c:41: Test marked todo: Fixme in the main process -advpack.c:42: Tests skipped: Skipped in the main process +----- Expected assessement: 2 failures, 1 todo, 1 skip +comboex.c:40: Test failed: A failure in the main process +comboex.c:41: Test succeeded inside todo block: Success in the main process +comboex.c:42: Test marked todo: Fixme in the main process +comboex.c:43: Tests skipped: Skipped in the main process This line says nothing is wrong because it's from the subprocess 1234:comboex: 116 tests executed (0 marked as todo, 0 failures), 0 skipped. -0c9c:comboex: 116 tests executed (1 marked as todo, 1 failure), 1 skipped. -comctl32:comboex:0c9c done (1) in 0s +0c9c:comboex: 116 tests executed (1 marked as todo, 2 failures), 1 skipped. +comctl32:comboex:0c9c done (2) in 0s comctl32:datetime start dlls/comctl32/tests/datetime.c - ----- A unit test reporting a failure but with no test failed line

1 0

Francois Gouget : testbot/reporttest: Make the 'misplaced summary line' test clearer.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: tools Branch: master Commit: 91ae35481394cc776fb740f1bc1fad40f50786e9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=91ae35481394cc776fb740f1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 18 09:33:24 2017 +0200 testbot/reporttest: Make the 'misplaced summary line' test clearer. By using a test unit name that is not used elsewhere we avoid any possible confusion. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 1eb3724..2d074f9 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -340,7 +340,7 @@ atl:module:0920 done (0) in 0s atl:registrar start dlls/atl/tests/registrar.c - ----- A unit test with a foreign test summary line ----- Expected assessement: "Misplaced test summary line" error -9876:service: 10 tests executed (0 marked as todo, 1 failures), 0 skipped. +9876:alien: 10 tests executed (0 marked as todo, 1 failures), 0 skipped. 0922:registrar: 17 tests executed (0 marked as todo, 0 failures), 0 skipped. atl:registrar:0922 done (0) in 0s

1 0

Francois Gouget : testbot/WineRunReconfig: Update the build VM' s TestBot checkout.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: tools Branch: master Commit: 6cad11f60de583ac44cb6643f07293f89da2a4f7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6cad11f60de583ac44cb6643… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 18 10:25:24 2017 +0200 testbot/WineRunReconfig: Update the build VM's TestBot checkout. This way the build VM gets not only a fresh Wine but also up-to-date TestBot tools and scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 737d26f..1337320 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -283,8 +283,10 @@ elsif ($Debug and !$VM->IsPoweredOn) # my $Script = "#!/bin/sh\n" . - "rm -f Reconfig.log\n" . - "../bin/build/Reconfig.pl >>Reconfig.log 2>&1\n"; + "(" . + " git pull &&\n" . + " ../bin/build/Reconfig.pl\n" . + ") >Reconfig.log 2>&1\n"; my $TA = $VM->GetAgent(); Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE))

1 0

Alexandre Julliard : Wine release 2.6
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: website Branch: master Commit: 7dfba1ecc5ff52b75c1e6880e07b106644a889c1 URL: http://source.winehq.org/git/website.git/?a=commit;h=7dfba1ecc5ff52b75c1e68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 13 20:06:19 2017 +0200 Wine release 2.6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017041301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2017041301.xml b/news/en/2017041301.xml new file mode 100644 index 0000000..c4f5cf2 --- /dev/null +++ b/news/en/2017041301.xml @@ -0,0 +1,16 @@ +<news> +<date>April 13, 2017</date> +<title>Wine 2.6 Released</title> +<body> + The Wine development release 2.6 is now available. + <a href="{$root}/announce/2.6">What's new</a> in this release: +<ul> + <li>Multi-threaded command stream in Direct3D.</li> + <li>More Shader Model 5 instructions.</li> + <li>More support for 3D textures.</li> + <li>Better font transformations in DirectWrite.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.6.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0