From adb5beda99a325c15dd91949279035e00f45ebf8 Mon Sep 17 00:00:00 2001
From: jBarz <jBarz@users.noreply.github.com>
Date: Mon, 12 Dec 2016 23:56:24 -0500
Subject: [PATCH] os: fix os.release() for aix and add test

PR-URL: https://github.com/nodejs/node/pull/10245
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 src/node_os.cc           | 7 +++++++
 test/parallel/test-os.js | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/src/node_os.cc b/src/node_os.cc
index 8b8c7b62c8518c..fb62c768a4e31f 100644
--- a/src/node_os.cc
+++ b/src/node_os.cc
@@ -83,7 +83,14 @@ static void GetOSRelease(const FunctionCallbackInfo<Value>& args) {
   if (uname(&info) < 0) {
     return env->ThrowErrnoException(errno, "uname");
   }
+# ifdef _AIX
+  char release[256];
+  snprintf(release, sizeof(release),
+           "%s.%s", info.version, info.release);
+  rval = release;
+# else
   rval = info.release;
+# endif
 #else  // Windows
   char release[256];
   OSVERSIONINFOW info;
diff --git a/test/parallel/test-os.js b/test/parallel/test-os.js
index 15fd189f9be20e..7d653ff04e8c90 100644
--- a/test/parallel/test-os.js
+++ b/test/parallel/test-os.js
@@ -62,6 +62,9 @@ assert.ok(type.length > 0);
 var release = os.release();
 console.log('release = ', release);
 assert.ok(release.length > 0);
+//TODO: Check format on more than just AIX
+if (common.isAix)
+  assert.ok(/^\d+\.\d+$/.test(release));
 
 var platform = os.platform();
 console.log('platform = ', platform);