added os version to os release for solaris
diff --git a/source/1.0/bin/gen_test_results.sh b/source/1.0/bin/gen_test_results.sh
index c231889..9d78d12 100755
--- a/source/1.0/bin/gen_test_results.sh
+++ b/source/1.0/bin/gen_test_results.sh
@@ -50,11 +50,11 @@
. ${LIB_DIR}/versions || die 'unable to load versions library'
os_name=`versions_osName |tr ' ' '_'`
-os_version=`versions_osVersion |tr ' ' '_'`
+os_release=`versions_osRelease |tr ' ' '_'`
DEFINE_boolean force false 'force overwrite' f
DEFINE_string output_dir "`pwd`" 'output dir' d
-DEFINE_string output_file "${os_name}-${os_version}.txt" 'output file' o
+DEFINE_string output_file "${os_name}-${os_release}.txt" 'output file' o
FLAGS "${@:-}" || exit $?
eval set -- "${FLAGS_ARGV}"
diff --git a/source/1.0/doc/CHANGES-1.0.txt b/source/1.0/doc/CHANGES-1.0.txt
index 11bdf92..fd740ba 100644
--- a/source/1.0/doc/CHANGES-1.0.txt
+++ b/source/1.0/doc/CHANGES-1.0.txt
@@ -38,6 +38,8 @@
All tests now properly enable skipping based on whether a standard or enhanced
getopt is found.
+Added the OS version to OS release for Solaris.
+
Changes with 1.0.2
------------------
diff --git a/source/1.0/lib/versions b/source/1.0/lib/versions
index 24757f1..a29ad3b 100755
--- a/source/1.0/lib/versions
+++ b/source/1.0/lib/versions
@@ -31,13 +31,13 @@
unset os_name_ os_system_
}
-versions_osVersion()
+versions_osRelease()
{
- os_version_='unrecognized'
+ os_str_='unrecognized'
os_system_=`uname -s`
os_release_=`uname -r`
case ${os_system_} in
- Cygwin) os_version_='unknown' ;;
+ Cygwin) os_str_='unknown' ;;
Darwin)
major_='10'
sub_=`echo ${os_release_} |\
@@ -47,24 +47,34 @@
9.*) minor_='5' ;;
*) minor_='X'; sub_='X' ;;
esac
- os_version_="${major_}.${minor_}.${sub_}"
+ os_str_="${major_}.${minor_}.${sub_}"
;;
Linux)
if [ -r '/etc/lsb-release' ]; then
- os_version_=`. /etc/lsb-release && \
+ os_str_=`. /etc/lsb-release && \
echo "${DISTRIB_ID:-}-${DISTRIB_RELEASE:-}"`
fi
- if [ "${os_version_}" = '-' ]; then
- os_version_=''
+ if [ "${os_release_}" = '-' ]; then
+ os_str_=''
if [ -r '/etc/redhat-release' ]; then
- os_version_=`cat /etc/redhat-release`
+ os_str_=`cat /etc/redhat-release`
fi
fi
;;
- SunOS) os_version_=`echo ${os_release_} |sed 's/[0-9]*\.\([0-9]*\)/\1/'` ;;
+ SunOS)
+ os_version_=`versions_osVersion`
+
+ os_str_=`echo ${os_release_} |sed 's/[0-9]*\.\([0-9]*\)/\1/'`
+ os_str_="${os_release_}-${os_version_}"
+ ;;
esac
- echo ${os_version_}
- unset os_name_ os_release_ os_version_ major_ minor_ sub_
+ echo ${os_str_}
+ unset os_name_ os_release_ os_str_ os_version_ major_ minor_ sub_
+}
+
+versions_osVersion()
+{
+ uname -v
}
versions_shellVersion()