June 2018 - Wine-Commits - list.winehq.org

Zebediah Figura : rpcrt4: Use publicly defined NDR constants.
by Alexandre Julliard June 13, 2018

June 13, 2018

Module: wine Branch: master Commit: 69cd52875ab9b412ad771ef76ca8eb4ba9c8816e URL: https://source.winehq.org/git/wine.git/?a=commit;h=69cd52875ab9b412ad771ef7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 12 21:19:10 2018 -0500 rpcrt4: Use publicly defined NDR constants. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_contexthandle.c | 2 - dlls/rpcrt4/ndr_es.c | 15 +- dlls/rpcrt4/ndr_marshall.c | 1420 +++++++++++++++++++-------------------- dlls/rpcrt4/ndr_ole.c | 6 +- dlls/rpcrt4/ndr_stubless.c | 241 ++++--- dlls/rpcrt4/ndr_stubless.h | 16 +- 6 files changed, 846 insertions(+), 854 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=69cd52875ab9b412ad77…

1 0

Dmitry Timoshkov : mstask: Implement ITask::GetWorkItemData().
by Alexandre Julliard June 13, 2018

June 13, 2018

Module: wine Branch: master Commit: c5d945c9f7c54ad552028eec4385a7662788ab7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5d945c9f7c54ad552028eec… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 13 12:04:41 2018 +0800 mstask: Implement ITask::GetWorkItemData(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 54e4912..490229a 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -840,13 +840,26 @@ static HRESULT WINAPI MSTASK_ITask_SetWorkItemData(ITask *iface, WORD count, BYT return S_OK; } -static HRESULT WINAPI MSTASK_ITask_GetWorkItemData( - ITask* iface, - WORD *pcBytes, - BYTE **ppBytes) +static HRESULT WINAPI MSTASK_ITask_GetWorkItemData(ITask *iface, WORD *count, BYTE **data) { - FIXME("(%p, %p, %p): stub\n", iface, pcBytes, ppBytes); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %p, %p)\n", iface, count, data); + + if (!This->data) + { + *count = 0; + *data = NULL; + } + else + { + *data = CoTaskMemAlloc(This->data_count); + if (!*data) return E_OUTOFMEMORY; + memcpy(*data, This->data, This->data_count); + *count = This->data_count; + } + + return S_OK; } static HRESULT WINAPI MSTASK_ITask_SetErrorRetryCount(

1 0

Zebediah Figura : winedbg: Make be_cpu process-specific.
by Alexandre Julliard June 13, 2018

June 13, 2018

Module: wine Branch: master Commit: 42bbeedbe40985fc6629b9c05469a89f838ac8f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42bbeedbe40985fc6629b9c0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jun 12 17:53:16 2018 -0500 winedbg: Make be_cpu process-specific. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_cpu.h | 2 -- programs/winedbg/break.c | 40 ++++++++++++++-------------- programs/winedbg/db_disasm.c | 4 +-- programs/winedbg/dbg.y | 4 +-- programs/winedbg/debugger.h | 3 ++- programs/winedbg/expr.c | 4 +-- programs/winedbg/gdbproxy.c | 17 ++++++------ programs/winedbg/info.c | 2 +- programs/winedbg/memory.c | 26 +++++++++--------- programs/winedbg/stack.c | 10 +++---- programs/winedbg/symbol.c | 2 +- programs/winedbg/tgt_active.c | 9 ++++--- programs/winedbg/tgt_minidump.c | 4 +-- programs/winedbg/types.c | 17 ++++++------ programs/winedbg/winedbg.c | 58 ++++++++++++++++++++--------------------- 15 files changed, 101 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=42bbeedbe40985fc6629…

1 0

Francois Gouget : testbot: Use FIXME to identify places that need fixing.
by Alexandre Julliard June 13, 2018

June 13, 2018

Module: tools Branch: master Commit: 04777eaad8011c5d8f69ad292bfbd6b602200355 URL: https://source.winehq.org/git/tools.git/?a=commit;h=04777eaad8011c5d8f69ad2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 13 11:47:25 2018 +0200 testbot: Use FIXME to identify places that need fixing. The comment that follows should identify the nature of the required fix. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 155717a..f675e6b 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -484,7 +484,7 @@ sub OnAction($$) if ($Action eq "Cancel") { -#TODO + # FIXME Todo } elsif ($Action eq "Add " . $self->{Collection}->GetItemName()) {

1 0

Francois Gouget : testbot/build: Simplify logging.
by Alexandre Julliard June 13, 2018

June 13, 2018

Module: tools Branch: master Commit: 89f704eba7d29e5dc78e109a6a779cda1385d6ee URL: https://source.winehq.org/git/tools.git/?a=commit;h=89f704eba7d29e5dc78e109… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 13 11:44:59 2018 +0200 testbot/build: Simplify logging. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 29 ++++++++++++----------------- testbot/bin/build/Reconfig.pl | 33 ++++++++++++++------------------- 2 files changed, 26 insertions(+), 36 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 001f5eb..3fe0e14 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -43,32 +43,27 @@ sub BEGIN use WineTestBot::Config; use WineTestBot::PatchUtils; +my $LogFileName = "$LogDir/Build.log"; + sub InfoMsg(@) { my $OldUMask = umask(002); - if (open LOGFILE, ">>$LogDir/Build.log") + if (open(my $Log, ">>", $LogFileName)) { - print LOGFILE @_; - close LOGFILE; + print $Log @_; + close($Log); } umask($OldUMask); } sub LogMsg(@) { - my $OldUMask = umask(002); - if (open LOGFILE, ">>$LogDir/Build.log") - { - print LOGFILE "Build: ", @_; - close LOGFILE; - } - umask($OldUMask); + InfoMsg "Build: ", @_; } sub FatalError(@) { LogMsg @_; - exit 1; } @@ -92,7 +87,7 @@ sub ApplyPatch($) system("( cd $DataDir/wine && set -x && " . " git apply --verbose $PatchFile && " . " git add -A " . - ") >> $LogDir/Build.log 2>&1"); + ") >>$LogFileName 2>&1"); if ($? != 0) { LogMsg "Patch failed to apply\n"; @@ -105,7 +100,7 @@ sub ApplyPatch($) InfoMsg "\nRunning make_makefiles\n"; system("( cd $DataDir/wine && set -x && " . " ./tools/make_makefiles " . - ") >> $LogDir/Build.log 2>&1"); + ") >>$LogFileName 2>&1"); if ($? != 0) { LogMsg "make_makefiles failed\n"; @@ -118,7 +113,7 @@ sub ApplyPatch($) InfoMsg "\nRunning autoconf\n"; system("( cd $DataDir/wine && set -x && " . " autoconf " . - ") >>$LogDir/Build.log 2>&1"); + ") >>$LogFileName 2>&1"); if ($? != 0) { LogMsg "Autoconf failed\n"; @@ -136,7 +131,7 @@ sub BuildNative() InfoMsg "\nRebuilding native tools\n"; system("( cd $DataDir/build-native && set -x && " . " time make -j$ncpus __tooldeps__ " . - ") >>$LogDir/Build.log 2>&1"); + ") >>$LogFileName 2>&1"); if ($? != 0) { LogMsg "Rebuild of native tools failed\n"; @@ -162,7 +157,7 @@ sub BuildTestExecutables($$) InfoMsg "\nBuilding the $Bits-bit test executable(s)\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . " time make -j$ncpus ". join(" ", sort @BuildDirs) . - ") >>$LogDir/Build.log 2>&1"); + ") >>$LogFileName 2>&1"); if ($? != 0) { LogMsg "Rebuild of $Bits-bit crossbuild failed\n"; @@ -186,7 +181,7 @@ $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; # Start with a clean logfile -unlink("$LogDir/Build.log"); +unlink($LogFileName); my ($PatchFile, $BitIndicators); if (@ARGV == 2) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 63fb01b..706da25 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -42,32 +42,27 @@ sub BEGIN use WineTestBot::Config; +my $LogFileName = "$LogDir/Reconfig.log"; + sub InfoMsg(@) { my $OldUMask = umask(002); - if (open LOGFILE, ">>$LogDir/Reconfig.log") + if (open(my $Log, ">>", $LogFileName)) { - print LOGFILE @_; - close LOGFILE; + print $Log @_; + close($Log); } umask($OldUMask); } sub LogMsg(@) { - my $OldUMask = umask(002); - if (open LOGFILE, ">>$LogDir/Reconfig.log") - { - print LOGFILE "Reconfig: ", @_; - close LOGFILE; - } - umask($OldUMask); + InfoMsg "Reconfig: ", @_; } sub FatalError(@) { LogMsg @_; - exit 1; } @@ -92,7 +87,7 @@ sub BuildTestAgentd() InfoMsg "\nBuilding the native testagentd\n"; system("( cd $::RootDir/src/testagentd && set -x && " . " time make -j$ncpus build " . - ") >>$LogDir/Reconfig.log 2>&1"); + ") >>$LogFileName 2>&1"); if ($? != 0) { LogMsg "Build testagentd failed\n"; @@ -103,7 +98,7 @@ sub BuildTestAgentd() InfoMsg "\nRebuilding the Windows TestAgentd\n"; system("( cd $::RootDir/src/testagentd && set -x && " . " time make -j$ncpus iso " . - ") >>$LogDir/Reconfig.log 2>&1"); + ") >>$LogFileName 2>&1"); if ($? != 0) { LogMsg "Build winetestbot.iso failed\n"; @@ -118,7 +113,7 @@ sub BuildTestLauncher() InfoMsg "\nRebuilding TestLauncher\n"; system("( cd $::RootDir/src/TestLauncher && set -x && " . " time make -j$ncpus" . - ") >>$LogDir/Reconfig.log 2>&1"); + ") >>$LogFileName 2>&1"); if ($? != 0) { LogMsg "Build TestLauncher failed\n"; @@ -131,7 +126,7 @@ sub BuildTestLauncher() sub GitPull() { InfoMsg "Updating the Wine source\n"; - system("cd $DataDir/wine && git pull >> $LogDir/Reconfig.log 2>&1"); + system("cd $DataDir/wine && git pull >>$LogFileName 2>&1"); if ($? != 0) { LogMsg "Git pull failed\n"; @@ -167,7 +162,7 @@ sub BuildNative() " rm -rf * && " . " time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && " . " time make -j$ncpus __tooldeps__ " . - ") >>$LogDir/Reconfig.log 2>&1"); + ") >>$LogFileName 2>&1"); if ($? != 0) { @@ -191,7 +186,7 @@ sub BuildCross($) " rm -rf * && " . " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype --disable-winetest && " . " time make -j$ncpus buildtests" . - ") >>$LogDir/Reconfig.log 2>&1"); + ") >>$LogFileName 2>&1"); if ($? != 0) { LogMsg "Build cross ($Bits bits) failed\n"; @@ -204,8 +199,8 @@ sub BuildCross($) $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; -# Start with clean logfile -unlink("$LogDir/Reconfig.log"); +# Start with a clean logfile +unlink($LogFileName); if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging") {

1 0

Francois Gouget : testbot: Remove the unneeded Build.pl parameters.
by Alexandre Julliard June 13, 2018

June 13, 2018

Module: tools Branch: master Commit: fb84879ce70a0ad379bc779a5c9c1c1483443874 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fb84879ce70a0ad379bc779… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 13 10:23:28 2018 +0200 testbot: Remove the unneeded Build.pl parameters. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 7a474e7..12e34d5 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -363,8 +363,7 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) } my $Script = "#!/bin/sh\n" . "rm -f Build.log\n" . - "../bin/build/Build.pl patch.diff " . $Step->FileType . - " $BaseName 32"; + "../bin/build/Build.pl patch.diff 32"; $Script .= ",64"if ($Run64); $Script .= " >>Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n");

1 0

Francois Gouget : testbot/build: Move GitPull() and call it a bit later in Reconfig.pl.
by Alexandre Julliard June 13, 2018

June 13, 2018

Module: tools Branch: master Commit: d37f1dbbce2982a4cf1ed66e7cbe48c4acf454fe URL: https://source.winehq.org/git/tools.git/?a=commit;h=d37f1dbbce2982a4cf1ed66… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 13 11:44:12 2018 +0200 testbot/build: Move GitPull() and call it a bit later in Reconfig.pl. The functions are now declared in the order in which they are called. Reconfig.pl now builds the TestBot tools and only then grabs the latest Wine and recompiles it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 64 +++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 977df6e..63fb01b 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -6,6 +6,7 @@ # 32 and 64 bit winetest binaries. # # Copyright 2009 Ge van Geldorp +# Copyright 2012-2014, 2017-2018 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -70,35 +71,6 @@ sub FatalError(@) exit 1; } -sub GitPull() -{ - InfoMsg "Updating the Wine source\n"; - system("cd $DataDir/wine && git pull >> $LogDir/Reconfig.log 2>&1"); - if ($? != 0) - { - LogMsg "Git pull failed\n"; - return !1; - } - - if (open(my $fh, ">", "$DataDir/testlist.txt")) - { - foreach my $TestFile (glob("$DataDir/wine/*/*/tests/*.c"), - glob("$DataDir/wine/*/*/tests/*.spec")) - { - next if ($TestFile =~ m=/testlist\.c$=); - $TestFile =~ s=^$DataDir/wine/==; - print $fh "$TestFile\n"; - } - close($fh); - } - else - { - LogMsg "Could not open 'testlist.txt' for writing: $!\n"; - } - - return 1; -} - my $ncpus; sub CountCPUs() { @@ -156,6 +128,35 @@ sub BuildTestLauncher() return 1; } +sub GitPull() +{ + InfoMsg "Updating the Wine source\n"; + system("cd $DataDir/wine && git pull >> $LogDir/Reconfig.log 2>&1"); + if ($? != 0) + { + LogMsg "Git pull failed\n"; + return !1; + } + + if (open(my $fh, ">", "$DataDir/testlist.txt")) + { + foreach my $TestFile (glob("$DataDir/wine/*/*/tests/*.c"), + glob("$DataDir/wine/*/*/tests/*.spec")) + { + next if ($TestFile =~ m=/testlist\.c$=); + $TestFile =~ s=^$DataDir/wine/==; + print $fh "$TestFile\n"; + } + close($fh); + } + else + { + LogMsg "Could not open 'testlist.txt' for writing: $!\n"; + } + + return 1; +} + sub BuildNative() { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); @@ -211,15 +212,12 @@ if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging") LogMsg "Unable to create '$DataDir/staging': $!\n"; exit(1); } -if (! GitPull()) -{ - exit(1); -} CountCPUs(); if (!BuildTestAgentd() || !BuildTestLauncher() || + !GitPull() || !BuildNative() || !BuildCross(32) || !BuildCross(64))

1 0

Francois Gouget : testbot: Fix UpdateStatus() to handle empty jobs and steps.
by Alexandre Julliard June 13, 2018

June 13, 2018

Module: tools Branch: master Commit: 8b8eced1fa117ba3f88d4fbdc1dc8d61d36d5fb2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8b8eced1fa117ba3f88d4fb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 13 11:47:05 2018 +0200 testbot: Fix UpdateStatus() to handle empty jobs and steps. We should not have empty jobs and steps but if we do make sure they are marked 'completed'. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 1 + testbot/lib/WineTestBot/Steps.pm | 1 + 2 files changed, 2 insertions(+) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index a13b346..6951b98 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -229,6 +229,7 @@ sub UpdateStatus($) my $StepStatus = $Step->UpdateStatus($Skip); $Has{$StepStatus} = 1; } + $Has{completed} = 1 if (!%Has); # This job has no step! # Inherit the steps most significant status. # Note that one or more tasks may have been requeued during the cleanup phase diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 8afe793..71e0447 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -200,6 +200,7 @@ sub UpdateStatus($$) my %Has; map { $Has{$_->UpdateStatus($Skip)} = 1 } (@{$self->Tasks->Clone()->GetItems()}); + $Has{completed} = 1 if (!%Has); # This step has no task! # Inherit the tasks most significant status. # Note that one or more tasks may have been requeued during the cleanup phase

1 0

Francois Gouget : testbot: Add some section headers to the scripts.
by Alexandre Julliard June 13, 2018

June 13, 2018

Module: tools Branch: master Commit: f8ab01fc59d28c5f208588a387166d73307f203a URL: https://source.winehq.org/git/tools.git/?a=commit;h=f8ab01fc59d28c5f208588a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 13 11:45:45 2018 +0200 testbot: Add some section headers to the scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 8 ++++++++ testbot/bin/WineRunBuild.pl | 4 ++++ testbot/bin/WineRunReconfig.pl | 4 ++++ testbot/bin/WineRunTask.pl | 9 +++++++++ testbot/bin/WineSendLog.pl | 10 ++++++++++ 5 files changed, 35 insertions(+) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index f7a6e33..9fb38ef 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -53,6 +53,11 @@ use WineTestBot::Tasks; use WineTestBot::Users; use WineTestBot::VMs; + +# +# Logging and error handling helpers +# + my $LogOnly; sub Trace(@) { @@ -67,6 +72,9 @@ sub Error(@) } +# +# Setup and command line processing +# $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 61deb50..31decc1 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -49,6 +49,10 @@ use WineTestBot::Log; use WineTestBot::Engine::Notify; +# +# Logging and error handling helpers +# + my $Debug; sub Debug(@) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 713712c..99b73da 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -48,6 +48,10 @@ use WineTestBot::Log; use WineTestBot::Engine::Notify; +# +# Logging and error handling helpers +# + my $Debug; sub Debug(@) { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index d757417..3290b0b 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -47,6 +47,10 @@ use WineTestBot::Log; use WineTestBot::Engine::Notify; +# +# Logging and error handling helpers +# + my $Debug; sub Debug(@) { @@ -60,6 +64,11 @@ sub Error(@) LogMsg @_; } + +# +# Task helpers +# + sub TakeScreenshot($$) { my ($VM, $FullScreenshotFileName) = @_; diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 2a89427..e03395a 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -501,6 +501,11 @@ EOF } } + +# +# Setup and command line processing +# + $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; @@ -528,6 +533,11 @@ if (! defined($Job)) exit(1); } + +# +# Analyze the log and notify the developer +# + SendLog($Job); LogMsg "Log for job $JobId sent\n";

1 0

Francois Gouget : testbot/build: Move up CountCPus() in Build.pl.
by Alexandre Julliard June 13, 2018

June 13, 2018

Module: tools Branch: master Commit: d60595a3bafb1aaef99a4c74d35b8d7598b9cda0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d60595a3bafb1aaef99a4c7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 13 11:44:27 2018 +0200 testbot/build: Move up CountCPus() in Build.pl. This way it matches Reconfig.pl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 8b18590..001f5eb 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -72,6 +72,18 @@ sub FatalError(@) exit 1; } +my $ncpus; +sub CountCPUs() +{ + if (open(my $fh, "<", "/proc/cpuinfo")) + { + # Linux + map { $ncpus++ if (/^processor/); } <$fh>; + close($fh); + } + $ncpus ||= 1; +} + sub ApplyPatch($) { my ($PatchFile) = @_; @@ -117,18 +129,6 @@ sub ApplyPatch($) return $Impacts; } -my $ncpus; -sub CountCPUs() -{ - if (open(my $fh, "<", "/proc/cpuinfo")) - { - # Linux - map { $ncpus++ if (/^processor/); } <$fh>; - close($fh); - } - $ncpus ||= 1; -} - sub BuildNative() { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native");

1 0