Skip to content

Commit 53030d2

Browse files
committed
fixup! test: change jenkins reporter
1 parent 5143039 commit 53030d2

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -570,15 +570,15 @@ endif
570570
# Related CI job: node-test-commit-arm-fanned
571571
test-ci-native: LOGLEVEL := info ## Build and test addons without building anything else.
572572
test-ci-native: | benchmark/napi/.buildstamp test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp test/sqlite/.buildstamp
573-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
573+
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap --error-reporter \
574574
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
575575
$(TEST_CI_ARGS) $(CI_NATIVE_SUITES)
576576

577577
.PHONY: test-ci-js
578578
# This target should not use a native compiler at all
579579
# Related CI job: node-test-commit-arm-fanned
580580
test-ci-js: | clear-stalled ## Build and test JavaScript with building anything else.
581-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
581+
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap --error-reporter \
582582
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
583583
--skip-tests=$(CI_SKIP_TESTS) \
584584
$(TEST_CI_ARGS) $(CI_JS_SUITES)
@@ -594,7 +594,7 @@ test-ci-js: | clear-stalled ## Build and test JavaScript with building anything
594594
test-ci: LOGLEVEL := info ## Build and test everything (CI).
595595
test-ci: | clear-stalled bench-addons-build build-addons build-js-native-api-tests build-node-api-tests build-sqlite-tests doc-only
596596
out/Release/cctest --gtest_output=xml:out/junit/cctest.xml
597-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
597+
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap --error-reporter \
598598
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
599599
$(TEST_CI_ARGS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES) $(CI_DOC)
600600
$(NODE) ./test/embedding/test-embedding.js

tools/test.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,7 @@ def HasRun(self, output):
316316

317317
class ActionsAnnotationProgressIndicator(DotsProgressIndicator):
318318
def AboutToRun(self, case):
319-
case.additional_flags = case.additional_flags.copy() if hasattr(case, 'additional_flags') else []
320-
case.additional_flags.append('--test-reporter=./test/common/test-error-reporter.js')
321-
case.additional_flags.append('--test-reporter-destination=stdout')
319+
pass
322320

323321
def GetAnnotationInfo(self, test, output):
324322
traceback = output.stdout + output.stderr
@@ -351,9 +349,7 @@ def Starting(self):
351349
self._done = 0
352350

353351
def AboutToRun(self, case):
354-
case.additional_flags = case.additional_flags.copy() if hasattr(case, 'additional_flags') else []
355-
case.additional_flags.append('--test-reporter=./test/common/test-error-reporter.js')
356-
case.additional_flags.append('--test-reporter-destination=stdout')
352+
pass
357353

358354
def HasRun(self, output):
359355
self._done += 1
@@ -1450,6 +1446,9 @@ def BuildOptions():
14501446
result.add_option("--type",
14511447
help="Type of build (simple, fips, coverage)",
14521448
default=None)
1449+
result.add_option("--error-reporter",
1450+
help="use error reporter",
1451+
default=False, action="store_true")
14531452
return result
14541453

14551454

@@ -1668,6 +1667,10 @@ def Main():
16681667
if options.worker:
16691668
run_worker = join(workspace, "tools", "run-worker.js")
16701669
options.node_args.append(run_worker)
1670+
1671+
if options.error_reporter:
1672+
options.node_args.append('--test-reporter=./test/common/test-error-reporter.js')
1673+
options.node_args.append('--test-reporter-destination=stdout')
16711674

16721675
processor = GetSpecialCommandProcessor(options.special_command)
16731676

0 commit comments

Comments
 (0)