github-repos/byte-unixbench
1
0
Fork 0
mirror of https://github.com/kdlucas/byte-unixbench.git synced 2024-12-11 23:30:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Run script fixes for AIX

Browse Source 
github: closes #46
This commit is contained in:
Glenn Strauss 2017-06-29 20:19:39 -04:00
parent aeed2ba662
commit 61663da4fd
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
UnixBench/Run
View File

@ -775,7 +775,9 @@ sub getSystemInfo {
$info->{'os'} = getCmdOutput("uname -o") || getCmdOutput("uname -s"); $info->{'os'} = getCmdOutput("uname -o") || getCmdOutput("uname -s");
$info->{'osRel'} = getCmdOutput("uname -r"); $info->{'osRel'} = getCmdOutput("uname -r");
$info->{'osVer'} = getCmdOutput("uname -v"); $info->{'osVer'} = getCmdOutput("uname -v");
$info->{'mach'} = getCmdOutput("uname -m"); $info->{'mach'} = $^O ne "aix"
? getCmdOutput("uname -m")
: getCmdOutput("uname -p");
$info->{'platform'} = getCmdOutput("uname -i") || "unknown"; $info->{'platform'} = getCmdOutput("uname -i") || "unknown";
# Get the system name (SUSE, Red Hat, etc.) if possible. # Get the system name (SUSE, Red Hat, etc.) if possible.
@ -788,9 +790,13 @@ sub getSystemInfo {
# Get the language info. # Get the language info.
my $lang = getCmdOutput("printenv LANG"); my $lang = getCmdOutput("printenv LANG");
my $map = getCmdOutput("locale -k LC_CTYPE | grep charmap") || ""; my $map = $^O ne "aix"
? getCmdOutput("locale -k LC_CTYPE | grep charmap") || ""
: getCmdOutput("locale charmap") || "";
$map =~ s/.*=//; $map =~ s/.*=//;
my $coll = getCmdOutput("locale -k LC_COLLATE | grep collate-codeset") || ""; my $coll = $^O ne "aix"
? getCmdOutput("locale -k LC_COLLATE | grep collate-codeset") || ""
: getCmdOutput("locale | grep LC_COLLATE") || "";
$coll =~ s/.*=//; $coll =~ s/.*=//;
$info->{'language'} = sprintf "%s (charmap=%s, collate=%s)", $info->{'language'} = sprintf "%s (charmap=%s, collate=%s)",
$lang, $map, $coll; $lang, $map, $coll;
@ -844,11 +850,12 @@ sub preChecks {
$ENV{'LANG'} = $language; $ENV{'LANG'} = $language;
# Check that the required files are in the proper places. # Check that the required files are in the proper places.
system("make check"); my $make = $ENV{MAKE} || "make";
system("$make check");
if ($? != 0) { if ($? != 0) {
system("make all"); system("$make all");
if ($? != 0) { if ($? != 0) {
abortRun("\"make all\" failed"); abortRun("\"$make all\" failed");
} }
} }