From cebb468ef5e82b8d4253e27ef70c67812cf93c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Thu, 6 Feb 2020 17:31:04 +0100 Subject: [PATCH] testutils: print a helpful summary of failed tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When debugging test failures in seven independent test cases, it might be helpful to only gather the debug output of the failing cases. Record the indexes of the tests that fail and print them in the VIR_TEST_RANGE of the command line that will result in only those tests being run. Signed-off-by: Ján Tomko Reviewed-by: Daniel P. Berrangé --- tests/testutils.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/testutils.c b/tests/testutils.c index 7b9a5ea05b..0cf0ac7e5c 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -54,6 +54,7 @@ static unsigned int testRegenerate = -1; static size_t testCounter; static virBitmapPtr testBitmap; +static virBitmapPtr failedTests; virArch virTestHostArch = VIR_ARCH_X86_64; @@ -172,6 +173,9 @@ virTestRun(const char *title, fprintf(stderr, "!"); } + if (ret != 0) + ignore_value(virBitmapSetBitExpand(failedTests, testCounter)); + g_unsetenv("VIR_TEST_MOCK_TESTNAME"); return ret; } @@ -930,6 +934,9 @@ int virTestMain(int argc, } } + if (!(failedTests = virBitmapNew(1))) + return EXIT_FAILURE; + ret = (func)(); virResetLastError(); @@ -938,6 +945,11 @@ int virTestMain(int argc, fprintf(stderr, "%*s", 40 - (int)(testCounter % 40), ""); fprintf(stderr, " %-3zu %s\n", testCounter, ret == 0 ? "OK" : "FAIL"); } + if (ret == EXIT_FAILURE && !virBitmapIsAllClear(failedTests)) { + g_autofree char *failed = virBitmapFormat(failedTests); + fprintf(stderr, "Some tests failed. Run them using:\n"); + fprintf(stderr, "VIR_TEST_DEBUG=1 VIR_TEST_RANGE=%s %s\n", failed, argv[0]); + } virLogReset(); return ret; }