April 2013 - Wine-Commits - list.winehq.org

Francois Gouget : testbot/WineRunTask: Nest the timeouts so each of them is correctly detected.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: tools Branch: master Commit: 735fa7e2f8c2a45022e28daf0d7977ebce33ba26 URL: http://source.winehq.org/git/tools.git/?a=commit;h=735fa7e2f8c2a45022e28daf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 29 14:04:00 2013 +0100 testbot/WineRunTask: Nest the timeouts so each of them is correctly detected. --- testbot/bin/WineRunTask.pl | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 903fbbe..991e143 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -251,6 +251,8 @@ if (!$TA->SendFile("$BinDir/windows/$TestLauncher", $TestLauncher, 0)) FatalError "Can't copy TestLauncher to VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } + +my $Timeout = $Task->Timeout; my $Script = "\@echo off\r\nset WINETEST_DEBUG=" . $Step->DebugLevel . "\r\n"; if ($Step->ReportSuccessfulTests) @@ -259,7 +261,10 @@ if ($Step->ReportSuccessfulTests) } if ($Step->Type eq "single") { - $Script .= "$TestLauncher -t " . $Task->Timeout . " $FileName "; + $Script .= "$TestLauncher -t $Timeout $FileName "; + # Add 1 second to the timeout so the client-side Wait() does not time out + # right before $TestLauncher does. + $Timeout += 1; my $CmdLineArg = $Task->CmdLineArg; if ($CmdLineArg) { @@ -307,7 +312,7 @@ if (!$TA->SendFileFromString($Script, "script.bat", $TestAgent::SENDFILE_EXE)) } my $Pid = $TA->Run(["./script.bat"], 0); -if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout)) +if (!$Pid or !defined $TA->Wait($Pid, $Timeout)) { $ErrMessage = $TA->GetLastError(); }

1 0

Francois Gouget : testbot/build: Detect build timeouts and set the task status accordingly.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: tools Branch: master Commit: b3234e6ed37feb343145bd65caf0546ae05bd53a URL: http://source.winehq.org/git/tools.git/?a=commit;h=b3234e6ed37feb343145bd65… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 29 14:03:21 2013 +0100 testbot/build: Detect build timeouts and set the task status accordingly. --- testbot/bin/WineRunBuild.pl | 12 ++++++++++-- testbot/bin/WineRunReconfig.pl | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index e385a0d..c230316 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -272,8 +272,16 @@ elsif (!defined $ErrMessage) if (defined $ErrMessage) { # Now we can report the previous Run() / Wait() error - FatalError "Failure running the build script in the VM: $ErrMessage\n", - $FullErrFileName, $Job, $Task; + if ($ErrMessage =~ /timed out waiting for the child process/) + { + $NewStatus = "badbuild"; + LogTaskError("The build timed out\n", $FullErrFileName); + } + else + { + FatalError "Failure running the build script in the VM: $ErrMessage\n", + $FullErrFileName, $Job, $Task; + } } # Don't try copying the test executables if the build step failed diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 6cbf75d..0728a0b 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -240,8 +240,16 @@ elsif (!defined $ErrMessage) if (defined $ErrMessage) { # Now we can report the previous Run() / Wait() error - FatalError "Could not run the reconfig script in the VM: $ErrMessage\n", - $FullErrFileName, $Job, $Task; + if ($ErrMessage =~ /timed out waiting for the child process/) + { + $NewStatus = "badbuild"; + LogTaskError("The reconfig timed out\n", $FullErrFileName); + } + else + { + FatalError "Could not run the reconfig script in the VM: $ErrMessage\n", + $FullErrFileName, $Job, $Task; + } } $TA->Disconnect();

1 0

Francois Gouget : testbot/bin: Add LogTaskError() to factorize reporting to the task's error log.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: tools Branch: master Commit: 13a8dfde4dbc692e3f3626b7616a6dac92ef066b URL: http://source.winehq.org/git/tools.git/?a=commit;h=13a8dfde4dbc692e3f3626b7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 29 14:02:36 2013 +0100 testbot/bin: Add LogTaskError() to factorize reporting to the task's error log. --- testbot/bin/WineRunBuild.pl | 35 ++++++++++++++++------------------- testbot/bin/WineRunReconfig.pl | 35 ++++++++++++++++------------------- testbot/bin/WineRunTask.pl | 32 ++++++++++++++++++-------------- 3 files changed, 50 insertions(+), 52 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 22018f1..e385a0d 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -42,19 +42,28 @@ use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::Engine::Notify; -sub FatalError($$$$) +sub LogTaskError($$) { - my ($ErrMessage, $FullErrFileName, $Job, $Task) = @_; - - my ($JobKey, $StepKey, $TaskKey) = @{$Task->GetMasterKey()}; - LogMsg "$JobKey/$StepKey/$TaskKey $ErrMessage"; - + my ($ErrMessage, $FullErrFileName) = @_; if (open(my $ErrFile, ">>", $FullErrFileName)) { print $ErrFile $ErrMessage; close($ErrFile); } + else + { + LogMsg "Unable to open '$FullErrFileName' for writing: $!\n"; + } +} +sub FatalError($$$$) +{ + my ($ErrMessage, $FullErrFileName, $Job, $Task) = @_; + + my ($JobKey, $StepKey, $TaskKey) = @{$Task->GetMasterKey()}; + LogMsg "$JobKey/$StepKey/$TaskKey $ErrMessage"; + + LogTaskError($ErrMessage, $FullErrFileName); $Task->Status("boterror"); $Task->Ended(time); $Task->Save(); @@ -109,19 +118,7 @@ sub ProcessLog($$) LogMsg "Unable to open '$FullLogFileName' for reading: $!\n"; } - if ($Errors) - { - if (open(my $ErrFile, ">", $FullErrFileName)) - { - print $ErrFile $Errors; - close($ErrFile); - } - else - { - LogMsg "Unable to open '$FullErrFileName' for writing: $!\n"; - } - } - + LogTaskError($Errors, $FullErrFileName) if ($Errors); return $Status; } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index b59332d..6cbf75d 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -42,19 +42,28 @@ use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::Engine::Notify; -sub FatalError($$$$) +sub LogTaskError($$) { - my ($ErrMessage, $FullErrFileName, $Job, $Task) = @_; - - my ($JobKey, $StepKey, $TaskKey) = @{$Task->GetMasterKey()}; - LogMsg "$JobKey/$StepKey/$TaskKey $ErrMessage"; - + my ($ErrMessage, $FullErrFileName) = @_; if (open(my $ErrFile, ">>", $FullErrFileName)) { print $ErrFile $ErrMessage; close($ErrFile); } + else + { + LogMsg "Unable to open '$FullErrFileName' for writing: $!\n"; + } +} + +sub FatalError($$$$) +{ + my ($ErrMessage, $FullErrFileName, $Job, $Task) = @_; + + my ($JobKey, $StepKey, $TaskKey) = @{$Task->GetMasterKey()}; + LogMsg "$JobKey/$StepKey/$TaskKey $ErrMessage"; + LogTaskError($ErrMessage, $FullErrFileName); $Task->Status("boterror"); $Task->Ended(time); $Task->Save(); @@ -109,19 +118,7 @@ sub ProcessLog($$) LogMsg "Unable to open '$FullLogFileName' for reading: $!\n"; } - if ($Errors) - { - if (open(my $ErrFile, ">", $FullErrFileName)) - { - print $ErrFile $Errors; - close($ErrFile); - } - else - { - LogMsg "Unable to open '$FullErrFileName' for writing: $!\n"; - } - } - + LogTaskError($Errors, $FullErrFileName) if ($Errors); return $Status; } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index e700610..903fbbe 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -41,21 +41,31 @@ use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::Engine::Notify; -sub FatalError($$$$$) +sub LogTaskError($$) { - my ($ErrMessage, $FullErrFileName, $Job, $Step, $Task) = @_; - - my ($JobKey, $StepKey, $TaskKey) = @{$Task->GetMasterKey()}; - LogMsg "$JobKey/$StepKey/$TaskKey $ErrMessage"; - + my ($ErrMessage, $FullErrFileName) = @_; my $OldUMask = umask(002); if (open(my $ErrFile, ">>", $FullErrFileName)) { + umask($OldUMask); print $ErrFile $ErrMessage; close($ErrFile); } - umask($OldUMask); + else + { + umask($OldUMask); + LogMsg "Unable to open '$FullErrFileName' for writing: $!\n"; + } +} +sub FatalError($$$$$) +{ + my ($ErrMessage, $FullErrFileName, $Job, $Step, $Task) = @_; + + my ($JobKey, $StepKey, $TaskKey) = @{$Task->GetMasterKey()}; + LogMsg "$JobKey/$StepKey/$TaskKey $ErrMessage"; + + LogTaskError($ErrMessage, $FullErrFileName); if ($Step->Type eq "suite") { my $LatestName = "$DataDir/latest/" . $Task->VM->Name . "_" . @@ -341,13 +351,7 @@ $Task->Ended(time); my $TestFailures = CountFailures($FullLogFileName); if (!defined $TestFailures) { - my $OldUMask = umask(002); - if (open ERRFILE, ">>$FullErrFileName") - { - print ERRFILE "No test summary line found\n"; - close ERRFILE; - } - umask($OldUMask); + LogTaskError("No test summary line found\n", $FullErrFileName); $TestFailures = 1; } $Task->TestFailures($TestFailures);

1 0

Francois Gouget : testbot: Add new status values to distinguish bad patches , build errors and TestBot errors.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: tools Branch: master Commit: fab277d195f56acd2e5e6078045077df215fdfa5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=fab277d195f56acd2e5e6078… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 29 14:02:16 2013 +0100 testbot: Add new status values to distinguish bad patches, build errors and TestBot errors. Also rename the 'failed' status to 'boterror' to make its meaning clearer and avoid confusion with test failures. --- testbot/bin/WineRunBuild.pl | 8 ++++---- testbot/bin/WineRunReconfig.pl | 8 ++++---- testbot/bin/WineRunTask.pl | 2 +- testbot/ddl/update24.sql | 31 +++++++++++++++++++++++++++++++ testbot/ddl/winetestbot.sql | 6 +++--- testbot/lib/WineTestBot/Jobs.pm | 10 +++++----- testbot/lib/WineTestBot/Steps.pm | 4 ++-- testbot/lib/WineTestBot/Tasks.pm | 6 +++--- testbot/web/JobDetails.pl | 2 +- testbot/web/WineTestBot.css | 4 +++- testbot/web/index.pl | 6 ++++-- 11 files changed, 61 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=fab277d195f56acd2e5e…

1 0

Jactry Zeng : Simplified Chinese translation for release 1.5.27
by Jeremy Newman April 1, 2013

April 1, 2013

Module: website Branch: master Commit: 66a139f513a994d0409324c3e9c546e0d77217aa URL: http://source.winehq.org/git/website.git/?a=commit;h=66a139f513a994d0409324… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sun Mar 31 10:39:28 2013 +0800 Simplified Chinese translation for release 1.5.27 --- news/zh-cn/2013032901.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/zh-cn/2013032901.xml b/news/zh-cn/2013032901.xml new file mode 100644 index 0000000..2e4e31b --- /dev/null +++ b/news/zh-cn/2013032901.xml @@ -0,0 +1,15 @@ +<news> +<date>三月 29, 2013</date> +<title>Wine 1.5.27 发布</title> +<body> + Wine 开发版 1.5.27 现在可以使用了。 + 本次<a href="{$root}/announce/1.5.27">更新</a>： +<ul> + <li>Mac 后端驱动对系统托盘的支持。</li> + <li>一些 C runtime 的改进。</li> + <li>为内建程序提供更高分辨率的图标。</li> + <li>各种 bug 修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.5.27.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

André Hentschel : Wine 1.5.27 freigegeben
by Jeremy Newman April 1, 2013

April 1, 2013

Module: website Branch: master Commit: 3018eedbbde4976ccfb8e02bfedafaff020a7580 URL: http://source.winehq.org/git/website.git/?a=commit;h=3018eedbbde4976ccfb8e0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 30 15:46:43 2013 +0100 Wine 1.5.27 freigegeben --- news/de/2013032901.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/de/2013032901.xml b/news/de/2013032901.xml new file mode 100644 index 0000000..837c570 --- /dev/null +++ b/news/de/2013032901.xml @@ -0,0 +1,15 @@ +<news> +<date>29. März 2013</date> +<title>Wine 1.5.27 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.27 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.27">Neuerungen (en)</a> in dieser Version: +<ul> + <li>System Tray Unterstützung im Mac Treiber.</li> + <li>Verschiedene C Runtime Verbesserungen.</li> + <li>Große Icons für die eigenen Programme.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.27.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Marcus Meissner : PATCH: WEBSITE: download for openSUSE
by Jeremy Newman April 1, 2013

April 1, 2013

Module: website Branch: master Commit: 967c1a575dc8aae5f71ca825d53e3141f2e52170 URL: http://source.winehq.org/git/website.git/?a=commit;h=967c1a575dc8aae5f71ca8… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Apr 1 14:42:35 2013 +0200 PATCH: WEBSITE: download for openSUSE >From ddc3651a80c68583859735bcd0b9b46076d95f4b Mon Sep 17 00:00:00 2001 From: Marcus Meissner <marcus(a)beiboot.suse.de> Date: Mon, 1 Apr 2013 14:41:31 +0200 Subject: [PATCH] updated openSUSE and SLE downloads --- templates/de/download.template | 4 +--- templates/en/download.template | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 7546090..7ade0fa 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -94,9 +94,7 @@ erbeten hat, dass sie die Wine-Website hosten. <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">SUSE</a> - stellt binär und Quellcode .rpms und tägliche snapshot RPMs für openSUSE 11.1, 11.2, 11.3, 11.4 sowie SUSE Linux Enterprise 10 und 11 bereit. - Alte Versionen sind auf <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a> - verfügbar. + stellt binär und Quellcode .rpms und tägliche snapshot RPMs für alle openSUSE Versionen (derzeit 11.1 bis 12.3) sowie SUSE Linux Enterprise 11 bereit. </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> diff --git a/templates/en/download.template b/templates/en/download.template index 0caab63..eb5d3a2 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -93,8 +93,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">Download SUSE packages</a> - - release binary and source .rpms and daily snapshot RPMs for openSUSE 11.1, 11.2, 11.3, 11.4 and SUSE Linux Enterprise 10 and 11. - Old package versions available on <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a> + - release binary and source .rpms and daily snapshot RPMs for all openSUSE versions (11.1 up to 12.3) and SUSE Linux Enterprise 11. </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.27
by Jeremy Newman April 1, 2013

April 1, 2013

Module: website Branch: master Commit: 722e99de3690c02b26cc0d34d72e4830c33fd851 URL: http://source.winehq.org/git/website.git/?a=commit;h=722e99de3690c02b26cc0d… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Mar 31 08:38:24 2013 +0200 Polish translation for release 1.5.27 --- news/pl/2013032901.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/pl/2013032901.xml b/news/pl/2013032901.xml new file mode 100644 index 0000000..2f638bd --- /dev/null +++ b/news/pl/2013032901.xml @@ -0,0 +1,15 @@ +<news> +<date>Marzec 29, 2013</date> +<title>Wydano Wine 1.5.27</title> +<body> + Wydanie rozwojowe Wine 1.5.27 jest już dostępne. + <a href="{$root}/announce/1.5.27">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla tacki systemowej w sterowniku Mac.</li> + <li>Rozmaite ulepszenia w bibliotece uruchomieniowej C.</li> + <li>Duże ikony dla wbudowanych aplikacji.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.27.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.5.27
by Jeremy Newman April 1, 2013

April 1, 2013

Module: website Branch: master Commit: 782fe54c7bbaab830be2a1d80c27fa5f7c5b0e4d URL: http://source.winehq.org/git/website.git/?a=commit;h=782fe54c7bbaab830be2a1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Mar 29 19:48:49 2013 +0100 French translation for release 1.5.27 --- news/fr/2013032901.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/fr/2013032901.xml b/news/fr/2013032901.xml new file mode 100644 index 0000000..afe0648 --- /dev/null +++ b/news/fr/2013032901.xml @@ -0,0 +1,14 @@ +<news> +<date>29 mars 2013</date> +<title>Sortie de Wine 1.5.27</title> +<body> + La version de développement 1.5.27 de Wine est disponible. + <a href="{$root}/announce/1.5.27">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge de la zone de notification dans le pilote Mac.</li> + <li>Diverses améliorations dans le moteur d'exécution C.</li> + <li>Grandes icônes pour les applications intégrées.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.27.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0