From ccf8d8b7548897dc6a79e59e63abb15fb6aff4e5 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Fri, 13 Sep 2024 13:37:27 +0200 Subject: [PATCH] fix #2501 the parallel execution of "make -j check" created a race condition in the static nonces tests. --- CHANGELOG.md | 1 + Makefile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4256b4e8f3..ffa8ed804d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file. This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... ## [unreleased][unreleased] +- Fix parallel `make -j check` Thanks @elboulangero (@iceman1001) - Added support for 8268/8310 (@douniwan5788) - Changed scripting string params to accept 1024 chars, Thanks @evildaemond! (@iceman1001) - Added detection for FM11NT021 (@iceman1001) diff --git a/Makefile b/Makefile index 30ddd146ef..5a07b580a0 100644 --- a/Makefile +++ b/Makefile @@ -114,10 +114,10 @@ cryptorf/check: FORCE $(Q)$(BASH) tools/pm3_tests.sh $(CHECKARGS) $(patsubst %/check,%,$@) mfc_card_only/check: FORCE $(info [*] CHECK $(patsubst %/check,%,$@)) - $(Q)$(BASH) tools/pm3_tests.sh $(CHECKARGS) $(patsubst %/check,%,$@) + $(Q)$(BASH) tools/pm3_tests.sh $(CHECKARGS) nonce2key staticnested $(patsubst %/check,%,$@) mfc_card_reader/check: FORCE $(info [*] CHECK $(patsubst %/check,%,$@)) - $(Q)$(BASH) tools/pm3_tests.sh $(CHECKARGS) $(patsubst %/check,%,$@) + $(Q)$(BASH) tools/pm3_tests.sh $(CHECKARGS) mfkey mf_nonce_brute $(patsubst %/check,%,$@) mfd_aes_brute/check: FORCE $(info [*] CHECK $(patsubst %/check,%,$@)) $(Q)$(BASH) tools/pm3_tests.sh $(CHECKARGS) $(patsubst %/check,%,$@)