Francois Gouget : testbot/build: Move up CountCPus() in Build.pl.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: d60595a3bafb1aaef99a4c74d35b8d7598b9cda0
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=d60595a3bafb1aaef99a4c74...

Author: Francois Gouget 
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 
Signed-off-by: Alexandre Julliard

---

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");