fix: ignore make exit summaries in resume checks

A failed make target names its Makefile even when an unrelated test
failed. Exclude these summaries from file attribution while retaining
direct Makefile diagnostics and failures in changed tests.

Assisted-by: Codex
Signed-off-by: Filip Skokan <panva.ip@gmail.com>

Author: panva

docs/ncu-ci.md

@@ -247,6 +247,8 @@ Before resuming, the command streams failed-job console output and compares
 failure diagnostics with the PR's changed files. When recovering through resume
 ancestry, it checks the latest run and every ancestor visited. It refuses to resume
 if a failed test or a file referenced in a failure diagnostic is changed by the PR.
+Generic `make` recipe-failure summaries do not count as file references; direct
+Makefile diagnostics, such as syntax errors, still do.
 The refusal includes the first matching filename, failure excerpt, and console
 log URL. Large excerpts are truncated with an explicit marker.
 Logs are scanned one at a time with bounded memory. HTTP compression is decoded as the

lib/ci/failure_file_scanner.js

@@ -13,6 +13,11 @@ const diagnostic = createMatcher(FAILURE_PATTERNS.diagnostic);
 const infrastructure = createMatcher(FAILURE_PATTERNS.infrastructure);
 const gitStart = createMatcher(FAILURE_MARKERS.git.map(({ start }) => start));
 const gitEnd = createMatcher(FAILURE_MARKERS.git.map(({ end }) => end));
+const makeRecipeFailure = createMatcher([
+  /^\s*(?:\[(?:out|err)\]\s*)?g?make(?:\[\d+\])?: \*\*\* \[[^\r\n]+\] .+$/,
+  /^\s*(?:\[(?:out|err)\]\s*)?[^\r\n]+:\d+: recipe for target '.+' failed$/
+]);
+const makefileDiagnostic = /^\s*(?:\[(?:out|err)\]\s*)?[^\r\n]+:\d+: \*\*\* /;
 
 // Keep both ends of large diagnostics without retaining whole lines or TAP blocks.
 class FailureExcerpt {
@@ -97,6 +102,13 @@ async function * failureLines(windows, matchFile) {
     line.gitEnd ||= gitEnd(text);
     if (lineEnd) {
       line.text = excerpt.toString();
+      if (makeRecipeFailure(line.text.trimEnd())) {
+        // The recipe location reports a child's exit, not the source of its
+        // failure. Keep the output without attributing it through TAP or history.
+        line = { text: line.text, todo: line.todo };
+      } else {
+        line.diagnostic ||= makefileDiagnostic.test(line.text);
+      }
       yield line;
       line = {};
       excerpt = new FailureExcerpt();

test/fixtures/ci-resume-make-failure.json

@@ -0,0 +1,7 @@
+{
+  "pr": "https://github.com/nodejs/node/pull/66228",
+  "url": "https://ci.nodejs.org/job/node-test-commit-linux/nodes=fedora-latest-x64/73461/consoleText",
+  "filename": "test/ffi/test-ffi-calls.js",
+  "failure": "not ok 81 ffi/test-ffi-calls\n  ---\n  duration_ms: 123029.13600\n  severity: fail\n  exitcode: -15\n  stack: |-\n    timeout\n    (node:1962772) ExperimentalWarning: FFI is an experimental feature and might change at any time\n    (Use `node --trace-warnings ...` to show where the warning was created)\n  ...",
+  "summary": "make[1]: *** [Makefile:660: test-ci] Error 1"
+}

test/unit/ci_failure_file_scanner.test.js

@@ -31,6 +31,8 @@ async function scan(...args) {
 // Complete console diagnostics and truncated report excerpts from September 23–25, 2026.
 const reliabilityFailures = JSON.parse(readFileSync(
   new URL('../fixtures/ci-reliability-failures.json', import.meta.url), 'utf8'));
+const makeFailure = JSON.parse(readFileSync(
+  new URL('../fixtures/ci-resume-make-failure.json', import.meta.url), 'utf8'));
 
 describe('Reliability report diagnostics', () => {
   for (const { name, kind, filenames, log } of reliabilityFailures) {
@@ -49,6 +51,74 @@ describe('Reliability report diagnostics', () => {
   }
 });
 
+describe('Make recipe failure summaries', () => {
+  const summary = makeFailure.summary;
+
+  it('attributes a test timeout to the test rather than the make recipe', async() => {
+    const log = `${makeFailure.failure}\n${summary}\n`;
+    for (const size of [1, 31, 8192]) {
+      assert.equal(await scan(log, ['Makefile'], size), undefined);
+      assert.deepEqual(await scanFailure(log, ['Makefile', makeFailure.filename], size),
+        { filename: makeFailure.filename, reason: makeFailure.failure });
+    }
+  });
+
+  for (const [name, footer] of [
+    ['recursive make', summary],
+    ['top-level make', 'make: *** [Makefile:660: test-ci] Error 2'],
+    ['gmake', 'gmake[2]: *** [Makefile:660: test-ci] Error 1'],
+    ['segmentation fault', 'make[1]: *** [Makefile:660: test-ci] Segmentation fault (core dumped)'],
+    ['abort', 'make[1]: *** [Makefile:660: test-ci] Aborted (core dumped)'],
+    ['failed recipe', "Makefile:660: recipe for target 'test-ci' failed"],
+    ['prefixed stdout', '  [out] make[1]: *** [Makefile:660: test-ci] Error 1'],
+    ['prefixed stderr', "    [err] Makefile:660: recipe for target 'test-ci' failed"]
+  ]) {
+    it(`ignores a propagated exit summary: ${name}`, async() => {
+      for (const size of [1, 31, 8192]) {
+        assert.equal(await scan(`${footer}\n`, ['Makefile'], size), undefined);
+      }
+    });
+  }
+
+  for (const [name, log] of [
+    ['preceding error', `error: unrelated failure\n${summary}\n`],
+    ['following filesystem error', `${summary}\nRead-only file system\n`],
+    ['following C++ failure', `${summary}\n[  FAILED  ] Example\n`],
+    ['following filename', `${summary}\nMakefile\n`],
+    ['TAP block', tap(`    ${summary}`)],
+    ['git failure block',
+      `Changes not staged for commit:\n${summary}\nno changes added to commit\n`]
+  ]) {
+    it(`does not use a propagated exit summary as failure context: ${name}`, async() => {
+      for (const size of [1, 31, 8192]) {
+        assert.equal(await scan(log, ['Makefile'], size), undefined);
+      }
+    });
+  }
+
+  it('continues to later failures and preserves the summary as output context', async() => {
+    const failure = tap(`    ${summary}\n    AssertionError: failure`);
+    const log = `${summary}\n${failure}`;
+    assert.deepEqual(await scanFailure(log, ['Makefile', filename], 1),
+      { filename, reason: failure.trimEnd() });
+  });
+
+  for (const [name, reason] of [
+    ['missing separator', 'Makefile:123: *** missing separator. Stop.'],
+    ['unterminated variable', 'Makefile:123: *** unterminated variable reference. Stop.'],
+    ['recipe before target', 'Makefile:123: *** recipe commences before first target. Stop.'],
+    ['invalid recipe', 'Makefile:123: error: invalid recipe'],
+    ['unreadable makefile', 'fatal: Unable to read Makefile: No such file or directory']
+  ]) {
+    it(`retains a genuine Makefile diagnostic: ${name}`, async() => {
+      for (const size of [1, 31, 8192]) {
+        assert.deepEqual(await scanFailure(`${reason}\n`, ['Makefile'], size),
+          { filename: 'Makefile', reason });
+      }
+    });
+  }
+});
+
 describe('Streaming failure file scanner', () => {
   it('returns the matching TAP failure without duplicating chunk overlaps', async() => {
     const failure = tap('  severity: fail\n  AssertionError: expected true, received false');

test/unit/ci_resume.test.js

@@ -59,6 +59,8 @@ const walkFailures = JSON.parse(readFileSync(
   new URL('../fixtures/ci-resume-walk.json', import.meta.url), 'utf8'));
 const reliabilityFailures = JSON.parse(readFileSync(
   new URL('../fixtures/ci-reliability-failures.json', import.meta.url), 'utf8'));
+const makeFailure = JSON.parse(readFileSync(
+  new URL('../fixtures/ci-resume-make-failure.json', import.meta.url), 'utf8'));
 
 describe('Resume file checks against real CI diagnostics', () => {
   for (const { name, kind, filenames, log, url } of reliabilityFailures) {
@@ -178,6 +180,29 @@ describe('Jenkins resume', () => {
     assert.deepEqual(cli._calls.stopSpinner.at(-1), ['PR CI job successfully resumed']);
   });
 
+  it('allows resuming when only a make exit summary references a changed file', async() => {
+    request.json.withArgs(filesURL).resolves([
+      { filename: 'Makefile' },
+      { filename: '.github/workflows/build-tarball.yml' },
+      { filename: '.github/workflows/test-shared.yml' }
+    ]);
+    request.text.resolves(`${makeFailure.failure}\n${makeFailure.summary}\n`);
+    assert.equal(await jobRunner.resume(), true);
+    sinon.assert.calledOnce(resumeRequest);
+    assert.deepEqual(cli._calls.error, []);
+  });
+
+  it('refuses resuming when the failing test changed despite a make exit summary', async() => {
+    request.json.withArgs(filesURL).resolves([
+      { filename: 'Makefile' }, { filename: makeFailure.filename }
+    ]);
+    request.text.resolves(`${makeFailure.failure}\n${makeFailure.summary}\n`);
+    assert.equal(await jobRunner.resume(), false);
+    sinon.assert.notCalled(resumeRequest);
+    assert.deepEqual(cli._calls.error, [[makeFailure.filename]]);
+    assert.deepEqual(cli._calls.log, [[makeFailure.failure]]);
+  });
+
   for (const result of ['FAILURE', 'ABORTED']) {
     it(`does not scan failures or POST when a ${result} job has no resume action`, async() => {
       request.json.withArgs(apiURL).resolves({ ...resumeBuildData, result });