test: move common.isCPPSymbolsNotMapped to tick-processor tests

`common.isCPPSymbolsNotMapped` is used only by the tests in the `test/tick-processor` folder. Move it local to those to get it out of `common`. PR-URL: #22459 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]> Reviewed-By: Refael Ackermann <[email protected]>
nodejs · Aug 24, 2018 · 6bb96a1 · 6bb96a1
1 parent 5673017
commit 6bb96a1
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 19 deletions.
diff --git a/test/common/README.md b/test/common/README.md
@@ -224,11 +224,6 @@ Platform check for Windows.
 
 Platform check for Windows 32-bit on Windows 64-bit.
 
-### isCPPSymbolsNotMapped
-* [&lt;boolean>]
-
-Platform check for C++ symbols are mapped or not.
-
 ### leakedGlobals()
 * return [&lt;Array>]
 

diff --git a/test/common/index.js b/test/common/index.js
@@ -799,9 +799,3 @@ exports.runWithInvalidFD = function(func) {
 
   exports.printSkipMessage('Could not generate an invalid fd');
 };
-
-exports.isCPPSymbolsNotMapped = exports.isWindows ||
-                                exports.isSunOS ||
-                                exports.isAIX ||
-                                exports.isLinuxPPCBE ||
-                                exports.isFreeBSD;
diff --git a/test/common/index.mjs b/test/common/index.mjs
@@ -51,8 +51,7 @@ const {
   getBufferSources,
   disableCrashOnUnhandledRejection,
   getTTYfd,
-  runWithInvalidFD,
-  isCPPSymbolsNotMapped
+  runWithInvalidFD
 } = common;
 
 export {
@@ -104,6 +103,5 @@ export {
   getBufferSources,
   disableCrashOnUnhandledRejection,
   getTTYfd,
-  runWithInvalidFD,
-  isCPPSymbolsNotMapped
+  runWithInvalidFD
 };
diff --git a/test/tick-processor/test-tick-processor-builtin.js b/test/tick-processor/test-tick-processor-builtin.js
@@ -1,10 +1,11 @@
 'use strict';
 const common = require('../common');
+const { isCPPSymbolsNotMapped } = require('./util');
 
 if (!common.enoughTestCpu)
   common.skip('test is CPU-intensive');
 
-if (common.isCPPSymbolsNotMapped) {
+if (isCPPSymbolsNotMapped) {
   common.skip('C++ symbols are not mapped for this os.');
 }
 

diff --git a/test/tick-processor/test-tick-processor-cpp-core.js b/test/tick-processor/test-tick-processor-cpp-core.js
@@ -1,10 +1,11 @@
 'use strict';
 const common = require('../common');
+const { isCPPSymbolsNotMapped } = require('./util');
 
 if (!common.enoughTestCpu)
   common.skip('test is CPU-intensive');
 
-if (common.isCPPSymbolsNotMapped) {
+if (isCPPSymbolsNotMapped) {
   common.skip('C++ symbols are not mapped for this os.');
 }
 

diff --git a/test/tick-processor/test-tick-processor-polyfill-brokenfile.js b/test/tick-processor/test-tick-processor-polyfill-brokenfile.js
@@ -1,12 +1,13 @@
 'use strict';
 const common = require('../common');
+const { isCPPSymbolsNotMapped } = require('./util');
 const tmpdir = require('../common/tmpdir');
 tmpdir.refresh();
 
 if (!common.enoughTestCpu)
   common.skip('test is CPU-intensive');
 
-if (common.isCPPSymbolsNotMapped) {
+if (isCPPSymbolsNotMapped) {
   common.skip('C++ symbols are not mapped for this OS.');
 }
 

diff --git a/test/tick-processor/test-tick-processor-preprocess-flag.js b/test/tick-processor/test-tick-processor-preprocess-flag.js
@@ -1,10 +1,11 @@
 'use strict';
 const common = require('../common');
+const { isCPPSymbolsNotMapped } = require('./util');
 
 if (!common.enoughTestCpu)
   common.skip('test is CPU-intensive');
 
-if (common.isCPPSymbolsNotMapped) {
+if (isCPPSymbolsNotMapped) {
   common.skip('C++ symbols are not mapped for this os.');
 }
 

diff --git a/test/tick-processor/util.js b/test/tick-processor/util.js
@@ -0,0 +1,18 @@
+'use strict';
+
+// Utilities for the tick-processor tests
+const {
+  isWindows,
+  isSunOS,
+  isAIX,
+  isLinuxPPCBE,
+  isFreeBSD
+} = require('../common');
+
+module.exports = {
+  isCPPSymbolsNotMapped: isWindows ||
+                         isSunOS ||
+                         isAIX ||
+                         isLinuxPPCBE ||
+                         isFreeBSD
+};