From 1ecc89ab14b640effcce3e73933927c1b98c0d2b Mon Sep 17 00:00:00 2001
From: Sam Roberts <vieuxtech@gmail.com>
Date: Fri, 28 Jun 2019 09:36:30 -0700
Subject: [PATCH 1/2] test: skip tests related to CI failures on AIX

These tests seem to trigger failures in the entire CI job (not just the
test) on AIX. Skip them to see if that helps alleviate spurious failures
in node-test-commit-aix (and the upstream PR and commit test jobs).

See:
- https://github.com/nodejs/build/issues/1820#issuecomment-505998851
- https://github.com/nodejs/build/issues/1847#issuecomment-504210708
---
 .../test-stringbytes-external-exceed-max.js                  | 5 +++++
 test/message/message.status                                  | 3 +++
 test/pseudo-tty/pseudo-tty.status                            | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max.js b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max.js
index d65144e04d457c..d6a442f7516c1f 100644
--- a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max.js
+++ b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max.js
@@ -5,6 +5,11 @@ const skipMessage = 'intensive toString tests due to memory confinements';
 if (!common.enoughTestMem)
   common.skip(skipMessage);
 
+// See https://github.com/nodejs/build/issues/1820#issuecomment-505998851
+// See https://github.com/nodejs/node/pull/28469
+if (process.platform === 'aix')
+  common.skip('flaky on AIX');
+
 const binding = require(`./build/${common.buildType}/binding`);
 
 // v8 fails silently if string length > v8::String::kMaxLength
diff --git a/test/message/message.status b/test/message/message.status
index 1a4a0e3adc2727..d7bd7f48c9faf8 100644
--- a/test/message/message.status
+++ b/test/message/message.status
@@ -16,3 +16,6 @@ prefix message
 
 [$system==freebsd]
 
+[$system==aix]
+# https://github.com/nodejs/node/pull/28469
+vm_dont_display_syntax_error: SKIP
diff --git a/test/pseudo-tty/pseudo-tty.status b/test/pseudo-tty/pseudo-tty.status
index 7925290e05acf6..9917c08181df8a 100644
--- a/test/pseudo-tty/pseudo-tty.status
+++ b/test/pseudo-tty/pseudo-tty.status
@@ -1,6 +1,10 @@
 prefix pseudo-tty
 
 [$system==aix]
+# https://github.com/nodejs/build/issues/1820#issuecomment-505998851
+# https://github.com/nodejs/node/pull/28469
+console-dumb-tty: SKIP
+test-fatal-error: SKIP
 
 [$system==solaris]
 # https://github.com/nodejs/node/pull/16225 - `ioctl(fd, TIOCGWINSZ)` seems

From cbd3c89d5d62830537d7f81a47df77aa53f229ca Mon Sep 17 00:00:00 2001
From: Sam Roberts <vieuxtech@gmail.com>
Date: Fri, 28 Jun 2019 11:35:50 -0700
Subject: [PATCH 2/2] fixup! test: skip tests related to CI failures on AIX

---
 test/sequential/sequential.status | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/sequential/sequential.status b/test/sequential/sequential.status
index 5b28e756287323..15010788fa3117 100644
--- a/test/sequential/sequential.status
+++ b/test/sequential/sequential.status
@@ -19,5 +19,8 @@ test-http2-large-file: PASS, FLAKY
 [$system==freebsd]
 
 [$system==aix]
+# https://github.com/nodejs/node/pull/28469
+test-async-wrap-getasyncid: SKIP
+test-buffer-creation-regression: SKIP
 
 [$arch==arm]