From bc22fc9b63c8d069f8f8791bb7a2e65e6ab15e41 Mon Sep 17 00:00:00 2001 From: "Johan T. Halseth" Date: Wed, 9 May 2018 09:53:35 +0200 Subject: [PATCH 1/2] makefile flakehunter: call $(ITEST) directly, print current time For some reason, starting the integration test using /bin/sh -c would cause unit tests to also be run. We fix this by just calling $(ITEST). --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5297aed0f..c8f7d5c10 100644 --- a/Makefile +++ b/Makefile @@ -166,8 +166,7 @@ unit-race: flakehunter: build @$(call print, "Flake hunting integration tests.") - $(ITEST) - while [ $$? -eq 0 ]; do /bin/sh -c "$(ITEST)"; done + while [ $$? -eq 0 ]; do $(ITEST); done flake-unit: @$(call print, "Flake hunting unit tests.") From 2313eb2c7b42000ce7a94eea36416436115fc701 Mon Sep 17 00:00:00 2001 From: "Johan T. Halseth" Date: Wed, 9 May 2018 10:02:30 +0200 Subject: [PATCH 2/2] make/testing_flags: delete log files before running itests, print date This commit makes sure old log files are deleted before running the integration tests. Previously new logs would be added to the existing ones, causing a big mess. This was especially messy during flake hunting, as all logs would be kept. In addition, we now print the date before every start of the integration tests, which is useful to see how long they have been running, for instance in case of a deadlock. --- make/testing_flags.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/testing_flags.mk b/make/testing_flags.mk index a9de0c88f..0180f85bd 100644 --- a/make/testing_flags.mk +++ b/make/testing_flags.mk @@ -44,4 +44,4 @@ endif # Construct the integration test command with the added build flags. ITEST_TAGS := $(TEST_TAGS) rpctest -ITEST := $(GOTEST) -tags="$(ITEST_TAGS)" $(TEST_FLAGS) -logoutput +ITEST := rm output*.log; date; $(GOTEST) -tags="$(ITEST_TAGS)" $(TEST_FLAGS) -logoutput