nodejs
diff --git a/‎test/abort/test-abort-backtrace.js‎
Lines changed: 42 additions & 3 deletions b/‎test/abort/test-abort-backtrace.js‎
Lines changed: 42 additions & 3 deletions
diff --git a/‎test/async-hooks/init-hooks.js‎
Lines changed: 3 additions & 2 deletions b/‎test/async-hooks/init-hooks.js‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎test/async-hooks/test-crypto-pbkdf2.js‎
Lines changed: 5 additions & 2 deletions b/‎test/async-hooks/test-crypto-pbkdf2.js‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎test/async-hooks/test-crypto-randomBytes.js‎
Lines changed: 5 additions & 2 deletions b/‎test/async-hooks/test-crypto-randomBytes.js‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎test/async-hooks/test-enable-disable.js‎
Lines changed: 2 additions & 1 deletion b/‎test/async-hooks/test-enable-disable.js‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎test/async-hooks/test-fseventwrap.js‎
Lines changed: 5 additions & 2 deletions b/‎test/async-hooks/test-fseventwrap.js‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎test/async-hooks/test-fsreqcallback-readFile.js‎
Lines changed: 3 additions & 1 deletion b/‎test/async-hooks/test-fsreqcallback-readFile.js‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎test/async-hooks/test-getaddrinforeqwrap.js‎
Lines changed: 3 additions & 1 deletion b/‎test/async-hooks/test-getaddrinforeqwrap.js‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎test/async-hooks/test-getnameinforeqwrap.js‎
Lines changed: 3 additions & 1 deletion b/‎test/async-hooks/test-getnameinforeqwrap.js‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎test/async-hooks/test-graph.signal.js‎
Lines changed: 5 additions & 2 deletions b/‎test/async-hooks/test-graph.signal.js‎
Lines changed: 5 additions & 2 deletions
@@ -1,24 +1,63 @@
 'use strict';
-const common = require('../common');
+require('../common');
 const assert = require('assert');
 const cp = require('child_process');
 
+function getPrintedStackTrace(stderr) {
+  const lines = stderr.split('\n');
+
+  let state = 'initial';
+  const result = {
+    message: [],
+    nativeStack: [],
+    jsStack: [],
+  };
+  for (let i = 0; i < lines.length; ++i) {
+    const line = lines[i].trim();
+    if (line.length === 0) {
+      continue;  // Skip empty lines.
+    }
+
+    switch (state) {
+      case 'initial':
+        result.message.push(line);
+        if (line.includes('Native stack trace')) {
+          state = 'native-stack';
+        } else {
+          result.message.push(line);
+        }
+        break;
+      case 'native-stack':
+        if (line.includes('JavaScript stack trace')) {
+          state = 'js-stack';
+        } else {
+          result.nativeStack.push(line);
+        }
+        break;
+      case 'js-stack':
+        result.jsStack.push(line);
+        break;
+    }
+  }
+  return result;
+}
+
 if (process.argv[2] === 'child') {
   process.abort();
 } else {
   const child = cp.spawnSync(`${process.execPath}`, [`${__filename}`, 'child']);
   const stderr = child.stderr.toString();
 
   assert.strictEqual(child.stdout.toString(), '');
-  const { nativeStack, jsStack } = common.getPrintedStackTrace(stderr);
+  const { nativeStack, jsStack } = getPrintedStackTrace(stderr);
 
   if (!nativeStack.every((frame, index) => frame.startsWith(`${index + 1}:`))) {
     assert.fail(`Each frame should start with a frame number:\n${stderr}`);
   }
 
   // For systems that don't support backtraces, the native stack is
   // going to be empty.
-  if (!common.isWindows && nativeStack.length > 0) {
+  if (process.platform !== 'win32' && nativeStack.length > 0) {
     const { getBinaryPath } = require('../common/shared-lib-util');
     if (!nativeStack.some((frame) => frame.includes(`[${getBinaryPath()}]`))) {
       assert.fail(`Some native stack frame include the binary name:\n${stderr}`);
 
@@ -1,9 +1,10 @@
 'use strict';
 // Flags: --expose-gc
 
-const common = require('../common');
+require('../common');
 const assert = require('assert');
 const async_hooks = require('async_hooks');
+const { isMainThread } = require('worker_threads');
 const util = require('util');
 const print = process._rawDebug;
 
@@ -161,7 +162,7 @@ class ActivityCollector {
         const stub = { uid, type: 'Unknown', handleIsObject: true, handle: {} };
         this._activities.set(uid, stub);
         return stub;
-      } else if (!common.isMainThread) {
+      } else if (!isMainThread) {
         // Worker threads start main script execution inside of an AsyncWrap
         // callback, so we don't yield errors for these.
         return null;
 
@@ -1,10 +1,13 @@
 'use strict';
 
 const common = require('../common');
-if (!common.hasCrypto)
+if (!common.hasCrypto) {
   common.skip('missing crypto');
-if (!common.isMainThread)
+}
+const { isMainThread } = require('worker_threads');
+if (!isMainThread) {
   common.skip('Worker bootstrapping works differently -> different async IDs');
+}
 
 const assert = require('assert');
 const tick = require('../common/tick');
 
@@ -1,10 +1,13 @@
 'use strict';
 
 const common = require('../common');
-if (!common.hasCrypto)
+if (!common.hasCrypto) {
   common.skip('missing crypto');
-if (!common.isMainThread)
+}
+const { isMainThread } = require('worker_threads');
+if (!isMainThread) {
   common.skip('Worker bootstrapping works differently -> different async IDs');
+}
 
 const assert = require('assert');
 const tick = require('../common/tick');
 
@@ -87,8 +87,9 @@ const assert = require('assert');
 const tick = require('../common/tick');
 const initHooks = require('./init-hooks');
 const { checkInvocations } = require('./hook-checks');
+const { isMainThread } = require('worker_threads');
 
-if (!common.isMainThread)
+if (!isMainThread)
   common.skip('Worker bootstrapping works differently -> different timing');
 
 // Include "Unknown"s because hook2 will not be able to identify
 
@@ -6,12 +6,15 @@ const initHooks = require('./init-hooks');
 const tick = require('../common/tick');
 const { checkInvocations } = require('./hook-checks');
 const fs = require('fs');
+const { isMainThread } = require('worker_threads');
 
-if (!common.isMainThread)
+if (!isMainThread) {
   common.skip('Worker bootstrapping works differently -> different async IDs');
+}
 
-if (common.isIBMi)
+if (common.isIBMi) {
   common.skip('IBMi does not support fs.watch()');
+}
 
 const hooks = initHooks();
 
 
@@ -6,9 +6,11 @@ const tick = require('../common/tick');
 const initHooks = require('./init-hooks');
 const { checkInvocations } = require('./hook-checks');
 const fs = require('fs');
+const { isMainThread } = require('worker_threads');
 
-if (!common.isMainThread)
+if (!isMainThread) {
   common.skip('Worker bootstrapping works differently -> different async IDs');
+}
 
 const hooks = initHooks();
 
 
@@ -6,9 +6,11 @@ const tick = require('../common/tick');
 const initHooks = require('./init-hooks');
 const { checkInvocations } = require('./hook-checks');
 const dns = require('dns');
+const { isMainThread } = require('worker_threads');
 
-if (!common.isMainThread)
+if (!isMainThread) {
   common.skip('Worker bootstrapping works differently -> different async IDs');
+}
 
 const hooks = initHooks();
 
 
@@ -6,9 +6,11 @@ const tick = require('../common/tick');
 const initHooks = require('./init-hooks');
 const { checkInvocations } = require('./hook-checks');
 const dns = require('dns');
+const { isMainThread } = require('worker_threads');
 
-if (!common.isMainThread)
+if (!isMainThread) {
   common.skip('Worker bootstrapping works differently -> different async IDs');
+}
 
 const hooks = initHooks();
 
 
@@ -1,10 +1,13 @@
 'use strict';
 
 const common = require('../common');
-if (common.isWindows)
+if (common.isWindows) {
   common.skip('no signals on Windows');
-if (!common.isMainThread)
+}
+const { isMainThread } = require('worker_threads');
+if (!isMainThread) {
   common.skip('No signal handling available in Workers');
+}
 
 const initHooks = require('./init-hooks');
 const verifyGraph = require('./verify-graph');