From 4464ea6b3b339c86348bfe0627ba9e90c6c98cf1 Mon Sep 17 00:00:00 2001
From: Xu Meng <mengxumx@cn.ibm.com>
Date: Mon, 13 Apr 2020 18:41:00 -0500
Subject: [PATCH] test: only detect uname on supported os

To skip some tests on IBMi PASE, we use
uname to detect the true os name, but
on Windows machines there is no uname
available.
---
 test/addons/openssl-binding/binding.gyp | 26 +++++++++++++++++--------
 test/addons/zlib-binding/binding.gyp    | 17 +++++++++++-----
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/test/addons/openssl-binding/binding.gyp b/test/addons/openssl-binding/binding.gyp
index 06c5d15057f586..c9ce9f1b2a6f6a 100644
--- a/test/addons/openssl-binding/binding.gyp
+++ b/test/addons/openssl-binding/binding.gyp
@@ -3,15 +3,25 @@
     {
       'target_name': 'binding',
       'includes': ['../common.gypi'],
-      'variables': {
-        # Skip this building on IBM i.
-        'aix_variant_name': '<!(uname -s)',
-      },
       'conditions': [
-        ['node_use_openssl=="true" and '
-         '"<(aix_variant_name)"!="OS400"', {
-          'sources': ['binding.cc'],
-          'include_dirs': ['../../../deps/openssl/openssl/include'],
+        ['node_use_openssl=="true"', {
+          'conditions': [
+            ['OS=="aix"', {
+              'variables': {
+                # Used to differentiate `AIX` and `OS400`(IBM i).
+                'aix_variant_name': '<!(uname -s)',
+              },
+              'conditions': [
+                [ '"<(aix_variant_name)"!="OS400"', { # Not `OS400`(IBM i)
+                  'sources': ['binding.cc'],
+                  'include_dirs': ['../../../deps/openssl/openssl/include'],
+                }],
+              ],
+            }, {
+              'sources': ['binding.cc'],
+              'include_dirs': ['../../../deps/openssl/openssl/include'],
+            }],
+          ],
         }],
         ['OS=="mac"', {
           'xcode_settings': {
diff --git a/test/addons/zlib-binding/binding.gyp b/test/addons/zlib-binding/binding.gyp
index 8c559cd715f779..f0f6d62a5f248c 100644
--- a/test/addons/zlib-binding/binding.gyp
+++ b/test/addons/zlib-binding/binding.gyp
@@ -2,12 +2,19 @@
   'targets': [
     {
       'target_name': 'binding',
-      'variables': {
-        # Skip this building on IBM i.
-        'aix_variant_name': '<!(uname -s)',
-      },
       'conditions': [
-        [ '"<(aix_variant_name)"!="OS400"', {
+        ['OS=="aix"', {
+          'variables': {
+            # Used to differentiate `AIX` and `OS400`(IBM i).
+            'aix_variant_name': '<!(uname -s)',
+          },
+          'conditions': [
+            [ '"<(aix_variant_name)"!="OS400"', { # Not `OS400`(IBM i)
+              'sources': ['binding.cc'],
+              'include_dirs': ['../../../deps/zlib'],
+            }],
+          ],
+        }, {
           'sources': ['binding.cc'],
           'include_dirs': ['../../../deps/zlib'],
         }],