test: fix MIN macro redefinition #31419

pull 0xB10C wants to merge 1 commits into bitcoin:master from 0xB10C:2024-12-fix-MIN-macro-redefined changing 1 files +4 −3

0xB10C commented at 2:57 PM on December 4, 2024: contributor

Renames the MIN macro to _TRACEPOINT_TEST_MIN.

From #31418:

stderr:
/virtual/main.c:70:9: warning: 'MIN' macro redefined [-Wmacro-redefined]
   70 | #define MIN(a,b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); _a < _b ? _a : _b; })
      |         ^
include/linux/minmax.h:329:9: note: previous definition is here
  329 | #define MIN(a,b) __cmp(min,a,b)
      |         ^
1 warning generated.

fixes: #31418

test: fix MIN macro-redefinition

Renames the `MIN` macro to `_TRACEPOINT_TEST_MIN`.

From #31418:

```
stderr:
/virtual/main.c:70:9: warning: 'MIN' macro redefined [-Wmacro-redefined]
   70 | #define MIN(a,b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); _a < _b ? _a : _b; })
      |         ^
include/linux/minmax.h:329:9: note: previous definition is here
  329 | #define MIN(a,b) __cmp(min,a,b)
      |         ^
1 warning generated.
```

fixes: https://github.com/bitcoin/bitcoin/issues/31418

00c1dbd26d

DrahtBot commented at 2:57 PM on December 4, 2024: contributor



The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Code Coverage & Benchmarks

For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/31419.



Reviews

See the guideline for information on the review process.

Type Reviewers

ACK maflcko

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
DrahtBot added the label Tests on Dec 4, 2024
fanquake added the label Needs backport (28.x) on Dec 4, 2024
maflcko commented at 3:20 PM on December 4, 2024: member

review ACK 00c1dbd26ddb816e5541c5724397015a92a3d06b
fanquake approved
fanquake commented at 5:12 PM on December 4, 2024: member

tack 00c1dbd26ddb816e5541c5724397015a92a3d06b
fanquake merged this on Dec 4, 2024
fanquake closed this on Dec 4, 2024
fanquake referenced this in commit 166fea73eb on Dec 4, 2024
achow101 referenced this in commit 227642d5af on Dec 11, 2024
fanquake commented at 11:15 AM on December 17, 2024: member

Backported in #31469.
fanquake removed the label Needs backport (28.x) on Dec 17, 2024
achow101 referenced this in commit 6db725662d on Dec 17, 2024
luke-jr commented at 11:30 PM on December 24, 2024: member

Should we do this in contrib/tracing/log_raw_p2p_msgs.py too?
luke-jr referenced this in commit f93f0c9396 on Jan 9, 2025
fanquake referenced this in commit 4bedfb5c83 on Jan 10, 2025
fanquake referenced this in commit 8588d5bbe0 on Jan 10, 2025
fanquake referenced this in commit 2829588882 on Jan 13, 2025
sedited referenced this in commit 230a439a4a on Jan 17, 2025
0xB10C deleted the branch on Feb 10, 2025
fanquake referenced this in commit 1e7041a9f3 on Feb 11, 2025
stickies-v referenced this in commit d760fd3dda on Mar 17, 2025
stickies-v referenced this in commit cc83553352 on Mar 17, 2025
stickies-v referenced this in commit 2614933f06 on Mar 17, 2025
stickies-v referenced this in commit b70418c5fc on Mar 17, 2025
stickies-v referenced this in commit 69f8a1fe50 on Mar 17, 2025
bug-castercv502 referenced this in commit 44b075fe71 on Sep 28, 2025
knst referenced this in commit 7cda369612 on Oct 22, 2025
knst referenced this in commit da9c13e93e on Oct 22, 2025
bitcoin locked this on Feb 10, 2026

Type	Reviewers
ACK	maflcko

Contributors

Labels

Linked (view graph)

#31418 test: failure in `interface_usdt_net.py`#31422 [27.x] More backports #31469 [28.x] 28.1rc2 backports #31623 tracing: Rename the `MIN` macro to `_TRACEPOINT_TEST_MIN` in log_raw_p2p_msgs

test: fix MIN macro redefinition #31419

Code Coverage & Benchmarks

Reviews