[PATCH 2/3] testbot/build: Move up CountCPus() in Build.pl.
Francois Gouget
fgouget at codeweavers.com
Wed Jun 13 04:44:27 CDT 2018
This way it matches Reconfig.pl.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
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 8b1859016..001f5eb18 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");
--
2.17.1
More information about the wine-devel
mailing list