Merge bitcoin/bitcoin#24715: build, test: Fix test logfile name

8b517fae7eb229911a5d41bbe26fbf6cc7de46df build, refactor: Replace tabs with spaces (Hennadii Stepanov)
dc0774cbdfaee5b81085596dbc686036ca9a2d51 build, test: Fix test logfile name (Hennadii Stepanov)

Pull request description:

  Recently merged bitcoin/bitcoin#19385 was flawed as it tries to `cat` a non-existed logfile:
  - bitcoin/bitcoin#19385 (comment)
  - bitcoin/bitcoin#19385 (comment)

  Closes bitcoin/bitcoin#17224.

ACKs for top commit:
  luke-jr:
    utACK 8b517fae7eb229911a5d41bbe26fbf6cc7de46df

Tree-SHA512: 6c6dab6d7d38b5e949f1159ddff8e431f26d7254157f8308d63383c0642154271107e384c77722b7cf77f0be204bd21d69f3a9e93a8d19cf48954ac673df6c7a

Author: MarcoFalke

src/Makefile.test.include

@@ -399,18 +399,18 @@ endif
 
 %.cpp.test: %.cpp
 	@echo Running tests: $$(\
-		cat $< | \
-		grep -E "(BOOST_FIXTURE_TEST_SUITE\\(|BOOST_AUTO_TEST_SUITE\\()" | \
-		cut -d '(' -f 2 | cut -d ',' -f 1 | cut -d ')' -f 1) \
-		from $<
-	$(AM_V_at)$(TEST_BINARY) \
-		--catch_system_errors=no -l test_suite -t "$$(\
-			cat $< | \
-			grep -E "(BOOST_FIXTURE_TEST_SUITE\\(|BOOST_AUTO_TEST_SUITE\\()" | \
-			cut -d '(' -f 2 | cut -d ',' -f 1 | cut -d ')' -f 1\
-		)" -- DEBUG_LOG_OUT > $(abs_builddir)/$$(\
-			echo $< | grep -E -o "(wallet/test/.*\.cpp|test/.*\.cpp)" | $(SED) -e s/\.cpp/.log/\
-		) 2>&1 || (cat $<.log && false)
+	  cat $< | \
+	  grep -E "(BOOST_FIXTURE_TEST_SUITE\\(|BOOST_AUTO_TEST_SUITE\\()" | \
+	  cut -d '(' -f 2 | cut -d ',' -f 1 | cut -d ')' -f 1\
+	) from $<
+	$(AM_V_at)export TEST_LOGFILE=$(abs_builddir)/$$(\
+	  echo $< | grep -E -o "(wallet/test/.*\.cpp|test/.*\.cpp)" | $(SED) -e s/\.cpp/.log/ \
+	) && \
+	$(TEST_BINARY) --catch_system_errors=no -l test_suite -t "$$(\
+	  cat $< | \
+	  grep -E "(BOOST_FIXTURE_TEST_SUITE\\(|BOOST_AUTO_TEST_SUITE\\()" | \
+	  cut -d '(' -f 2 | cut -d ',' -f 1 | cut -d ')' -f 1\
+	)" -- DEBUG_LOG_OUT > "$$TEST_LOGFILE" 2>&1 || (cat "$$TEST_LOGFILE" && false)
 
 test/data/%.json.h: test/data/%.json
 	@$(MKDIR_P) $(@D)