- Improved portability of the sql-bench Perl scripts by replacing

   the calls of external programs "uname" and "pwd" with Perl builtin
   functions "cwd()" and "POSIX::uname()"


sql-bench/as3ap.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/bench-count-distinct.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/bench-init.pl.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
   - portability fix: don't call external "uname" in various combinations,
     use POSIX::uname() instead.
sql-bench/copy-db.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/crash-me.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
   - portability fix: don't call external "uname" in various combinations,
     use POSIX::uname() instead.
sql-bench/innotest1.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/innotest1a.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/innotest1b.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/innotest2.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/innotest2a.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/innotest2b.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/run-all-tests.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-ATIS.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-alter-table.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-big-tables.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-connect.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-create.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-insert.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-select.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-transactions.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.
sql-bench/test-wisconsin.sh:
   - portability fix: don't call external "pwd" command, use the "cwd()"
     builtin function instead.

1 files changed, 3 insertions, 18 deletions

diff --git a/sql-bench/bench-init.pl.sh b/sql-bench/bench-init.pl.sh
index b02f5034637..1ac5f29723b 100644
--- a/sql-bench/bench-init.pl.sh
+++ b/sql-bench/bench-init.pl.sh
@@ -33,6 +33,7 @@
 
 $benchmark_version="2.15";
 use Getopt::Long;
+use POSIX;
 
 require "$pwd/server-cfg" || die "Can't read Configuration file: $!\n";
 
@@ -417,24 +418,8 @@ sub machine_part
 
 sub machine
 {
-  $name= `uname -s -r -m`;
-  if ($?)
-  {
-    $name= `uname -s -m`;
-  }
-  if ($?)
-  {
-    $name= `uname -s`;
-  }
-  if ($?)
-  {
-    $name= `uname`;
-  }
-  if ($?)
-  {
-    $name="unknown";
-  }
-  chomp($name); $name =~ s/[\n\r]//g;
+  my @name = POSIX::uname();
+  my $name= $name[0] . " " . $name[2] . " " . $name[4];
   return $name;
 }