Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 7505b86

Browse filesBrowse files
jBarzMylesBorins
authored andcommitted
os: fix os.release() for aix and add test
PR-URL: #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>
1 parent 0bb77f2 commit 7505b86
Copy full SHA for 7505b86

File tree

Expand file treeCollapse file tree

2 files changed

+10
-0
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

2 files changed

+10
-0
lines changed
Open diff view settings
Collapse file

‎src/node_os.cc‎

Copy file name to clipboardExpand all lines: src/node_os.cc
+7Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,14 @@ static void GetOSRelease(const FunctionCallbackInfo<Value>& args) {
8383
if (uname(&info) < 0) {
8484
return env->ThrowErrnoException(errno, "uname");
8585
}
86+
# ifdef _AIX
87+
char release[256];
88+
snprintf(release, sizeof(release),
89+
"%s.%s", info.version, info.release);
90+
rval = release;
91+
# else
8692
rval = info.release;
93+
# endif
8794
#else // Windows
8895
char release[256];
8996
OSVERSIONINFOW info;
Collapse file

‎test/parallel/test-os.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-os.js
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ assert.ok(type.length > 0);
6262
var release = os.release();
6363
console.log('release = ', release);
6464
assert.ok(release.length > 0);
65+
//TODO: Check format on more than just AIX
66+
if (common.isAix)
67+
assert.ok(/^\d+\.\d+$/.test(release));
6568

6669
var platform = os.platform();
6770
console.log('platform = ', platform);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.