platform: Set _GO_PLATFORM_VERSION_ID via uname -r

This is in preparation for adding a new `goinfo` command to emit
version and platform information, which will be useful in generating bug
reports.

Author: mbland

lib/platform

@@ -56,6 +56,10 @@ _@go.platform_ostype() {
     _GO_PLATFORM_ID="$OSTYPE"
     ;;
   esac
+
+  if command -v 'uname' >/dev/null; then
+    _GO_PLATFORM_VERSION_ID="$(uname -r)"
+  fi
 }
 
 _@go.platform() {

tests/platform.bats

@@ -12,9 +12,20 @@ setup() {
     '  printf "%s=\"%s\"\n" "$var" "${!var}"' \
     'done'
   export __GO_ETC_OS_RELEASE="$BATS_TEST_ROOTDIR/os-release"
+
+  stub_program_in_path 'uname' \
+    'if [[ "$*" == "-r" ]]; then' \
+    '  printf "$TEST_UNAME_VERSION\n"' \
+    'fi'
+
+  stub_program_in_path 'git' \
+    'if [[ "$*" == "--version" ]]; then' \
+    '  printf "git version %s\n" "$TEST_GIT_VERSION"' \
+    'fi'
 }
 
 teardown() {
+  restore_programs_in_path 'git' 'uname'
   @go.remove_test_go_rootdir
 }
 
@@ -38,29 +49,45 @@ teardown() {
     '_GO_PLATFORM_VERSION_ID="666"'
 }
 
-@test "$SUITE: set _GO_PLATFORM_ID from OSTYPE" {
-  OSTYPE='foobar' run "$TEST_GO_SCRIPT"
-  assert_success '_GO_PLATFORM_ID="foobar"'
+@test "$SUITE: set _GO_PLATFORM_{ID,VERSION_ID} from OSTYPE, uname -r" {
+  OSTYPE='foobar' TEST_UNAME_VERSION='3.27' run "$TEST_GO_SCRIPT"
+  assert_success
+  assert_lines_equal \
+    '_GO_PLATFORM_ID="foobar"' \
+    '_GO_PLATFORM_VERSION_ID="3.27"'
 }
 
-@test "$SUITE: set _GO_PLATFORM_ID to macos from OSTYPE" {
-  OSTYPE='darwin16' run "$TEST_GO_SCRIPT"
-  assert_success '_GO_PLATFORM_ID="macos"'
+@test "$SUITE: macos _GO_PLATFORM_{ID,VERSION_ID} from OSTYPE, uname -r" {
+  OSTYPE='darwin16.3.0' TEST_UNAME_VERSION='17.0.0' run "$TEST_GO_SCRIPT"
+  assert_success
+  assert_lines_equal \
+    '_GO_PLATFORM_ID="macos"' \
+    '_GO_PLATFORM_VERSION_ID="17.0.0"'
 }
 
-@test "$SUITE: set _GO_PLATFORM_ID to freebsd from OSTYPE" {
-  OSTYPE='freebsd11.0' run "$TEST_GO_SCRIPT"
-  assert_success '_GO_PLATFORM_ID="freebsd"'
+@test "$SUITE: freebsd _GO_PLATFORM_{ID,VERSION_ID} from OSTYPE, uname -r" {
+  OSTYPE='freebsd11.0' TEST_UNAME_VERSION='11.1-RELEASE-p1' \
+    run "$TEST_GO_SCRIPT"
+  assert_success
+  assert_lines_equal \
+    '_GO_PLATFORM_ID="freebsd"' \
+    '_GO_PLATFORM_VERSION_ID="11.1-RELEASE-p1"'
 }
 
-@test "$SUITE: set _GO_PLATFORM_ID to msys from OSTYPE" {
-  stub_program_in_path 'git' 'printf "%s\n" "git version 2.13.0"'
-  OSTYPE='msys' run "$TEST_GO_SCRIPT"
-  assert_success '_GO_PLATFORM_ID="msys"'
+@test "$SUITE: msys _GO_PLATFORM_{ID,VERSION_ID} from OSTYPE, uname -r" {
+  OSTYPE='msys' TEST_UNAME_VERSION='2.9.0(0.318/5/3)' \
+    TEST_GIT_VERSION='2.14.2' run "$TEST_GO_SCRIPT"
+  assert_success
+  assert_lines_equal \
+    '_GO_PLATFORM_ID="msys"' \
+    '_GO_PLATFORM_VERSION_ID="2.9.0(0.318/5/3)"'
 }
 
-@test "$SUITE: set _GO_PLATFORM_ID to msys-git from OSTYPE and git --version" {
-  stub_program_in_path 'git' 'printf "%s\n" "git version 2.13.0.windows.1"'
-  OSTYPE='msys' run "$TEST_GO_SCRIPT"
-  assert_success '_GO_PLATFORM_ID="msys-git"'
+@test "$SUITE: msys-git _GO_PLATFORM_* from OSTYPE, git --version, uname -r" {
+  OSTYPE='msys' TEST_UNAME_VERSION='2.8.0(0.310/5/3)' \
+    TEST_GIT_VERSION='git version 2.13.0.windows.1' run "$TEST_GO_SCRIPT"
+  assert_success
+  assert_lines_equal \
+    '_GO_PLATFORM_ID="msys-git"' \
+    '_GO_PLATFORM_VERSION_ID="2.8.0(0.310/5/3)"'
 }