Skip to content

Commit

Permalink
test: move inspector tests to parallel/sequential
Browse files Browse the repository at this point in the history
* remove inspector directory artifacts

PR-URL: #16197
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
maclover7 authored and refack committed Oct 17, 2017
1 parent ff747e3 commit 978629c
Show file tree
Hide file tree
Showing 31 changed files with 23 additions and 45 deletions.
3 changes: 0 additions & 3 deletions Makefile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -409,9 +409,6 @@ test-pummel: all
test-internet: all test-internet: all
$(PYTHON) tools/test.py internet $(PYTHON) tools/test.py internet


test-inspector: all
$(PYTHON) tools/test.py inspector

test-node-inspect: $(NODE_EXE) test-node-inspect: $(NODE_EXE)
USE_EMBEDDED_NODE_INSPECT=1 $(NODE) tools/test-npm-package \ USE_EMBEDDED_NODE_INSPECT=1 $(NODE) tools/test-npm-package \
--install deps/node-inspect test --install deps/node-inspect test
Expand Down
1 change: 0 additions & 1 deletion test/README.md
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ On how to run tests in this directory, see
|es-module |Yes |Test ESM module loading.| |es-module |Yes |Test ESM module loading.|
|fixtures | |Test fixtures used in various tests throughout the test suite.| |fixtures | |Test fixtures used in various tests throughout the test suite.|
|gc |No |Tests for garbage collection related functionality.| |gc |No |Tests for garbage collection related functionality.|
|inspector |Yes |Tests for the V8 inspector integration.|
|internet |No |Tests that make real outbound connections (mainly networking related modules). Tests for networking related modules may also be present in other directories, but those tests do not make outbound connections.| |internet |No |Tests that make real outbound connections (mainly networking related modules). Tests for networking related modules may also be present in other directories, but those tests do not make outbound connections.|
|known_issues |Yes |Tests reproducing known issues within the system. All tests inside of this directory are expected to fail consistently. If a test doesn't fail on certain platforms, those should be skipped via `known_issues.status`.| |known_issues |Yes |Tests reproducing known issues within the system. All tests inside of this directory are expected to fail consistently. If a test doesn't fail on certain platforms, those should be skipped via `known_issues.status`.|
|message |Yes |Tests for messages that are output for various conditions (```console.log```, error messages etc.)| |message |Yes |Tests for messages that are output for various conditions (```console.log```, error messages etc.)|
Expand Down
File renamed without changes.
File renamed without changes.
16 changes: 0 additions & 16 deletions test/inspector/inspector.status

This file was deleted.

6 changes: 0 additions & 6 deletions test/inspector/testcfg.py

This file was deleted.

5 changes: 5 additions & 0 deletions test/parallel/parallel.status
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ prefix parallel
[true] # This section applies to all platforms [true] # This section applies to all platforms


[$system==win32] [$system==win32]
test-inspector-bindings : PASS, FLAKY
test-inspector-debug-end : PASS, FLAKY
test-inspector-stop-profile-after-done: PASS, FLAKY


[$system==linux] [$system==linux]


Expand All @@ -19,3 +22,5 @@ test-npm-install: PASS,FLAKY


[$system==freebsd] [$system==freebsd]


[$system==aix]
test-inspector-stop-profile-after-done: PASS, FLAKY
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const common = require('../common');
common.skipIfInspectorDisabled(); common.skipIfInspectorDisabled();
common.skipIf32Bits(); common.skipIf32Bits();
common.crashOnUnhandledRejection(); common.crashOnUnhandledRejection();
const { NodeInstance } = require('../inspector/inspector-helper.js'); const { NodeInstance } = require('../common/inspector-helper.js');
const assert = require('assert'); const assert = require('assert');


// Even with --inspect, the default async call stack depth is 0. We need a // Even with --inspect, the default async call stack depth is 0. We need a
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const common = require('../common');
common.skipIfInspectorDisabled(); common.skipIfInspectorDisabled();
common.skipIf32Bits(); common.skipIf32Bits();
common.crashOnUnhandledRejection(); common.crashOnUnhandledRejection();
const { NodeInstance } = require('./inspector-helper.js'); const { NodeInstance } = require('../common/inspector-helper.js');
const assert = require('assert'); const assert = require('assert');


const script = ` const script = `
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const common = require('../common');
common.skipIfInspectorDisabled(); common.skipIfInspectorDisabled();
common.skipIf32Bits(); common.skipIf32Bits();
common.crashOnUnhandledRejection(); common.crashOnUnhandledRejection();
const { NodeInstance } = require('../inspector/inspector-helper.js'); const { NodeInstance } = require('../common/inspector-helper.js');
const assert = require('assert'); const assert = require('assert');


const script = ` const script = `
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const common = require('../common');
common.skipIfInspectorDisabled(); common.skipIfInspectorDisabled();
common.skipIf32Bits(); common.skipIf32Bits();
common.crashOnUnhandledRejection(); common.crashOnUnhandledRejection();
const { NodeInstance } = require('./inspector-helper'); const { NodeInstance } = require('../common/inspector-helper');
const assert = require('assert'); const assert = require('assert');


const script = `runTest(); const script = `runTest();
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const common = require('../common');
common.skipIfInspectorDisabled(); common.skipIfInspectorDisabled();
common.skipIf32Bits(); common.skipIf32Bits();
common.crashOnUnhandledRejection(); common.crashOnUnhandledRejection();
const { NodeInstance } = require('./inspector-helper'); const { NodeInstance } = require('../common/inspector-helper');
const assert = require('assert'); const assert = require('assert');


const script = 'setInterval(() => { debugger; }, 50);'; const script = 'setInterval(() => { debugger; }, 50);';
Expand Down
File renamed without changes.
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const common = require('../common');
common.skipIfInspectorDisabled(); common.skipIfInspectorDisabled();


const assert = require('assert'); const assert = require('assert');
const { NodeInstance } = require('./inspector-helper.js'); const { NodeInstance } = require('../common/inspector-helper.js');


async function runTests() { async function runTests() {
const instance = new NodeInstance(undefined, 'console.log(10)'); const instance = new NodeInstance(undefined, 'console.log(10)');
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
const common = require('../common'); const common = require('../common');
common.skipIfInspectorDisabled(); common.skipIfInspectorDisabled();
const assert = require('assert'); const assert = require('assert');
const { NodeInstance } = require('./inspector-helper.js'); const { NodeInstance } = require('../common/inspector-helper.js');
const path = require('path'); const fixtures = require('../common/fixtures');


const script = path.join(path.dirname(module.filename), 'global-function.js'); const script = fixtures.path('inspector-global-function.js');


async function setupDebugger(session) { async function setupDebugger(session) {
console.log('[test]', 'Setting up a debugger'); console.log('[test]', 'Setting up a debugger');
Expand Down
File renamed without changes.
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ common.skipIfInspectorDisabled();


const assert = require('assert'); const assert = require('assert');
const { mainScriptPath, const { mainScriptPath,
NodeInstance } = require('./inspector-helper.js'); NodeInstance } = require('../common/inspector-helper.js');


async function testBreakpointOnStart(session) { async function testBreakpointOnStart(session) {
const commands = [ const commands = [
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
const common = require('../common'); const common = require('../common');
common.skipIfInspectorDisabled(); common.skipIfInspectorDisabled();
const { strictEqual } = require('assert'); const { strictEqual } = require('assert');
const { NodeInstance } = require('./inspector-helper.js'); const { NodeInstance } = require('../common/inspector-helper.js');


async function testNoServerNoCrash() { async function testNoServerNoCrash() {
console.log('Test there\'s no crash stopping server that was not started'); console.log('Test there\'s no crash stopping server that was not started');
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const fixtures = require('../common/fixtures');
common.skipIfInspectorDisabled(); common.skipIfInspectorDisabled();


const assert = require('assert'); const assert = require('assert');
const { NodeInstance } = require('./inspector-helper.js'); const { NodeInstance } = require('../common/inspector-helper.js');


const script = fixtures.path('throws_error.js'); const script = fixtures.path('throws_error.js');


Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const common = require('../common');
common.skipIfInspectorDisabled(); common.skipIfInspectorDisabled();


const assert = require('assert'); const assert = require('assert');
const { NodeInstance } = require('./inspector-helper.js'); const { NodeInstance } = require('../common/inspector-helper.js');
const os = require('os'); const os = require('os');


const ip = pickIPv4Address(); const ip = pickIPv4Address();
Expand Down
Original file line number Original file line Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'; 'use strict';
const common = require('../common'); const common = require('../common');
common.skipIfInspectorDisabled(); common.skipIfInspectorDisabled();
const { NodeInstance } = require('./inspector-helper.js'); const { NodeInstance } = require('../common/inspector-helper.js');


async function runTests() { async function runTests() {
const script = 'setInterval(() => {debugger;}, 60000);'; const script = 'setInterval(() => {debugger;}, 60000);';
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
const common = require('../common'); const common = require('../common');
common.skipIfInspectorDisabled(); common.skipIfInspectorDisabled();
common.crashOnUnhandledRejection(); common.crashOnUnhandledRejection();
const { NodeInstance } = require('./inspector-helper.js'); const { NodeInstance } = require('../common/inspector-helper.js');
const assert = require('assert'); const assert = require('assert');


const script = ` const script = `
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
const common = require('../common'); const common = require('../common');
common.skipIfInspectorDisabled(); common.skipIfInspectorDisabled();
const assert = require('assert'); const assert = require('assert');
const { NodeInstance } = require('./inspector-helper.js'); const { NodeInstance } = require('../common/inspector-helper.js');


async function runTests() { async function runTests() {
const child = new NodeInstance(['--inspect=0'], const child = new NodeInstance(['--inspect=0'],
Expand Down
File renamed without changes.
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ common.skipIfInspectorDisabled();
const assert = require('assert'); const assert = require('assert');
const { mainScriptPath, const { mainScriptPath,
readMainScriptSource, readMainScriptSource,
NodeInstance } = require('./inspector-helper.js'); NodeInstance } = require('../common/inspector-helper.js');


function checkListResponse(response) { function checkListResponse(response) {
assert.strictEqual(1, response.length); assert.strictEqual(1, response.length);
Expand Down
File renamed without changes.
File renamed without changes.
3 changes: 1 addition & 2 deletions vcbuild.bat
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ if /i "%1"=="test-addons-napi" set test_args=%test_args% addons-napi&set build
if /i "%1"=="test-simple" set test_args=%test_args% sequential parallel -J&goto arg-ok if /i "%1"=="test-simple" set test_args=%test_args% sequential parallel -J&goto arg-ok
if /i "%1"=="test-message" set test_args=%test_args% message&goto arg-ok if /i "%1"=="test-message" set test_args=%test_args% message&goto arg-ok
if /i "%1"=="test-gc" set test_args=%test_args% gc&set build_testgc_addon=1&goto arg-ok if /i "%1"=="test-gc" set test_args=%test_args% gc&set build_testgc_addon=1&goto arg-ok
if /i "%1"=="test-inspector" set test_args=%test_args% inspector&goto arg-ok
if /i "%1"=="test-tick-processor" set test_args=%test_args% tick-processor&goto arg-ok if /i "%1"=="test-tick-processor" set test_args=%test_args% tick-processor&goto arg-ok
if /i "%1"=="test-internet" set test_args=%test_args% internet&goto arg-ok if /i "%1"=="test-internet" set test_args=%test_args% internet&goto arg-ok
if /i "%1"=="test-pummel" set test_args=%test_args% pummel&goto arg-ok if /i "%1"=="test-pummel" set test_args=%test_args% pummel&goto arg-ok
Expand Down Expand Up @@ -536,7 +535,7 @@ echo Failed to create vc project files.
goto exit goto exit


:help :help
echo vcbuild.bat [debug/release] [msi] [test/test-ci/test-all/test-uv/test-inspector/test-internet/test-pummel/test-simple/test-message/test-async-hooks/test-v8/test-v8-intl/test-v8-benchmarks/test-v8-all] [clean] [noprojgen] [small-icu/full-icu/without-intl] [nobuild] [sign] [x86/x64] [vs2015/vs2017] [download-all] [enable-vtune] [lint/lint-ci] [no-NODE-OPTIONS] [link-module path-to-module] echo vcbuild.bat [debug/release] [msi] [test/test-ci/test-all/test-uv/test-internet/test-pummel/test-simple/test-message/test-async-hooks/test-v8/test-v8-intl/test-v8-benchmarks/test-v8-all] [clean] [noprojgen] [small-icu/full-icu/without-intl] [nobuild] [sign] [x86/x64] [vs2015/vs2017] [download-all] [enable-vtune] [lint/lint-ci] [no-NODE-OPTIONS] [link-module path-to-module]
echo Examples: echo Examples:
echo vcbuild.bat : builds release build echo vcbuild.bat : builds release build
echo vcbuild.bat debug : builds debug build echo vcbuild.bat debug : builds debug build
Expand Down

0 comments on commit 978629c

Please sign in to comment.