FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

test: remove test/gc, integrate into parallel · nodejs/node@0beffc0 · GitHub

/ node Public

Commit 0beffc0

Browse files
addaleax
authored and
targos
committed
test: remove test/gc, integrate into parallel
There’s no reason to have a separate addon just for testing GC anymore. PR-URL: #22001 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Jon Moss <me@jonathanmoss.me> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 29bc553 commit 0beffc0

13 files changed

Lines changed: 23 additions & 152 deletions

‎Makefile‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -314,15 +314,6 @@ benchmark/napi/function_args/build/Release/binding.node: all \
314314
--directory="$(shell pwd)/benchmark/napi/function_args" \
315315
--nodedir="$(shell pwd)"
316316

317-
# Implicitly depends on $(NODE_EXE). We don't depend on it explicitly because
318-
# it always triggers a rebuild due to it being a .PHONY rule. See the comment
319-
# near the build-addons rule for more background.
320-
test/gc/build/Release/binding.node: test/gc/binding.cc test/gc/binding.gyp
321-
$(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
322-
--python="$(PYTHON)" \
323-
--directory="$(shell pwd)/test/gc" \
324-
--nodedir="$(shell pwd)"
325-
326317
DOCBUILDSTAMP_PREREQS = tools/doc/addon-verify.js doc/api/addons.md
327318

328319
ifeq ($(OSTYPE),aix)
@@ -405,20 +396,12 @@ clear-stalled:
405396
echo $${PS_OUT} | xargs kill -9; \
406397
fi
407398

408-
.PHONY: test-gc
409-
test-gc: all test/gc/build/Release/binding.node
410-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) gc
411-
412-
.PHONY: test-gc-clean
413-
test-gc-clean:
414-
$(RM) -r test/gc/build
415-
416399
test-build: | all build-addons build-addons-napi
417400

418401
test-build-addons-napi: all build-addons-napi
419402

420403
.PHONY: test-all
421-
test-all: test-build test/gc/build/Release/binding.node ## Run everything in test/.
404+
test-all: test-build ## Run everything in test/.
422405
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=debug,release
423406

424407
test-all-valgrind: test-build
@@ -1185,7 +1168,6 @@ LINT_CPP_FILES = $(filter-out $(LINT_CPP_EXCLUDE), $(wildcard \
11851168
test/cctest/*.h \
11861169
test/addons-napi/*/*.cc \
11871170
test/addons-napi/*/*.h \
1188-
test/gc/binding.cc \
11891171
tools/icu/*.cc \
11901172
tools/icu/*.h \
11911173
))

‎test/README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ GitHub with the `autocrlf` git config flag set to true.
2121
|common | |Common modules shared among many tests. [Documentation](./common/README.md)|
2222
|es-module |Yes |Test ESM module loading.|
2323
|fixtures | |Test fixtures used in various tests throughout the test suite.|
24-
|gc |No |Tests for garbage collection related functionality.|
2524
|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.|
2625
|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`.|
2726
|message |Yes |Tests for messages that are output for various conditions (```console.log```, error messages etc.)|

‎test/gc/.gitignore‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/gc/binding.cc‎

Lines changed: 0 additions & 80 deletions
This file was deleted.

‎test/gc/binding.gyp‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎test/gc/testcfg.py‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

test/gc/test-http-client-connaborted.js renamed to test/parallel/test-gc-http-client-connaborted.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict';
2-
// just like test/gc/http-client.js,
2+
// Flags: --expose-gc
3+
// just like test-gc-http-client.js,
34
// but aborting every connection that comes in.
45

56
const common = require('../common');
@@ -9,7 +10,6 @@ function serverHandler(req, res) {
910
}
1011

1112
const http = require('http');
12-
const weak = require(`./build/${common.buildType}/binding`);
1313
const todo = 500;
1414
let done = 0;
1515
let count = 0;
@@ -36,7 +36,7 @@ function getall() {
3636
}, cb).on('error', cb);
3737

3838
count++;
39-
weak(req, afterGC);
39+
common.onGC(req, { ongc });
4040
})();
4141

4242
setImmediate(getall);
@@ -45,7 +45,7 @@ function getall() {
4545
for (let i = 0; i < 10; i++)
4646
getall();
4747

48-
function afterGC() {
48+
function ongc() {
4949
countGC++;
5050
}
5151

test/gc/test-http-client-onerror.js renamed to test/parallel/test-gc-http-client-onerror.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict';
2-
// just like test/gc/http-client.js,
2+
// Flags: --expose-gc
3+
// just like test-gc-http-client.js,
34
// but with an on('error') handler that does nothing.
45

56
const common = require('../common');
@@ -11,7 +12,6 @@ function serverHandler(req, res) {
1112
}
1213

1314
const http = require('http');
14-
const weak = require(`./build/${common.buildType}/binding`);
1515
const todo = 500;
1616
let done = 0;
1717
let count = 0;
@@ -42,7 +42,7 @@ function getall() {
4242
}, cb).on('error', onerror);
4343

4444
count++;
45-
weak(req, afterGC);
45+
common.onGC(req, { ongc });
4646
})();
4747

4848
setImmediate(getall);
@@ -53,7 +53,7 @@ function runTest() {
5353
getall();
5454
}
5555

56-
function afterGC() {
56+
function ongc() {
5757
countGC++;
5858
}
5959

test/gc/test-http-client-timeout.js renamed to test/parallel/test-gc-http-client-timeout.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict';
2-
// just like test/gc/http-client.js,
2+
// Flags: --expose-gc
3+
// just like test-gc-http-client.js,
34
// but with a timeout set
45

56
const common = require('../common');
@@ -13,7 +14,6 @@ function serverHandler(req, res) {
1314
}
1415

1516
const http = require('http');
16-
const weak = require(`./build/${common.buildType}/binding`);
1717
const todo = 550;
1818
let done = 0;
1919
let count = 0;
@@ -45,7 +45,7 @@ function getall() {
4545
});
4646

4747
count++;
48-
weak(req, afterGC);
48+
common.onGC(req, { ongc });
4949
})();
5050

5151
setImmediate(getall);
@@ -54,7 +54,7 @@ function getall() {
5454
for (let i = 0; i < 10; i++)
5555
getall();
5656

57-
function afterGC() {
57+
function ongc() {
5858
countGC++;
5959
}
6060

test/gc/test-http-client.js renamed to test/parallel/test-gc-http-client.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
'use strict';
2+
// Flags: --expose-gc
23
// just a simple http server and client.
34

45
const common = require('../common');
@@ -9,7 +10,6 @@ function serverHandler(req, res) {
910
}
1011

1112
const http = require('http');
12-
const weak = require(`./build/${common.buildType}/binding`);
1313
const todo = 500;
1414
let done = 0;
1515
let count = 0;
@@ -40,7 +40,7 @@ function getall() {
4040
}, cb);
4141

4242
count++;
43-
weak(req, afterGC);
43+
common.onGC(req, { ongc });
4444
})();
4545

4646
setImmediate(getall);
@@ -49,7 +49,7 @@ function getall() {
4949
for (let i = 0; i < 10; i++)
5050
getall();
5151

52-
function afterGC() {
52+
function ongc() {
5353
countGC++;
5454
}
5555

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL