1.1 --- a/test/test_env.sh Fri Jan 23 22:39:24 2015 -0500
1.2 +++ b/test/test_env.sh Wed Jan 21 12:38:11 2015 +0100
1.3 @@ -1,6 +1,6 @@
1.4 #!/bin/sh
1.5 #
1.6 -# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
1.7 +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
1.8 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.9 #
1.10 # This code is free software; you can redistribute it and/or modify it
1.11 @@ -53,7 +53,7 @@
1.12 # set platform-dependent variables
1.13 OS=`uname -s`
1.14 case "$OS" in
1.15 - SunOS | Linux | Darwin )
1.16 + AIX | Darwin | Linux | SunOS )
1.17 NULL=/dev/null
1.18 PS=":"
1.19 FS="/"
1.20 @@ -130,26 +130,31 @@
1.21 fi
1.22
1.23 VM_OS="unknown"
1.24 -grep "solaris" vm_version.out > ${NULL}
1.25 +grep "aix" vm_version.out > ${NULL}
1.26 if [ $? = 0 ]
1.27 then
1.28 - VM_OS="solaris"
1.29 + VM_OS="aix"
1.30 +fi
1.31 +grep "bsd" vm_version.out > ${NULL}
1.32 +if [ $? = 0 ]
1.33 +then
1.34 + VM_OS="bsd"
1.35 fi
1.36 grep "linux" vm_version.out > ${NULL}
1.37 if [ $? = 0 ]
1.38 then
1.39 VM_OS="linux"
1.40 fi
1.41 +grep "solaris" vm_version.out > ${NULL}
1.42 +if [ $? = 0 ]
1.43 +then
1.44 + VM_OS="solaris"
1.45 +fi
1.46 grep "windows" vm_version.out > ${NULL}
1.47 if [ $? = 0 ]
1.48 then
1.49 VM_OS="windows"
1.50 fi
1.51 -grep "bsd" vm_version.out > ${NULL}
1.52 -if [ $? = 0 ]
1.53 -then
1.54 - VM_OS="bsd"
1.55 -fi
1.56
1.57 VM_CPU="unknown"
1.58 grep "sparc" vm_version.out > ${NULL}
