From 9903338b5ea59093d77cfe50ec0b1c22d4a7d843 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Sat, 24 Aug 2019 11:35:43 +0900 Subject: [PATCH] Remove dry-run mode from isolationtester The original purpose of the dry-run mode is to be able to print all the possible permutations from a spec file, but it has become less useful since isolation tests has improved regarding deadlock detection as one step not wanted by the author could block indefinitely now (originally the step blocked would have been detected rather quickly). Per discussion, let's remove it. Author: Michael Paquier Reviewed-by: Asim Praveen, Melanie Plageman Discussion: https://postgr.es/m/20190819080820.GG18166@paquier.xyz --- src/test/isolation/isolationtester.c | 31 +--------------------------- 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c index f98bb1cf64..66ebe3b27e 100644 --- a/src/test/isolation/isolationtester.c +++ b/src/test/isolation/isolationtester.c @@ -31,9 +31,6 @@ static int *backend_pids = NULL; static const char **backend_pid_strs = NULL; static int nconns = 0; -/* In dry run only output permutations to be run by the tester. */ -static int dry_run = false; - static void run_testspec(TestSpec *testspec); static void run_all_permutations(TestSpec *testspec); static void run_all_permutations_recurse(TestSpec *testspec, int nsteps, @@ -76,13 +73,10 @@ main(int argc, char **argv) int nallsteps; Step **allsteps; - while ((opt = getopt(argc, argv, "nV")) != -1) + while ((opt = getopt(argc, argv, "V")) != -1) { switch (opt) { - case 'n': - dry_run = true; - break; case 'V': puts("isolationtester (PostgreSQL) " PG_VERSION); exit(0); @@ -144,16 +138,6 @@ main(int argc, char **argv) } } - /* - * In dry-run mode, just print the permutations that would be run, and - * exit. - */ - if (dry_run) - { - run_testspec(testspec); - return 0; - } - printf("Parsed test spec with %d sessions\n", testspec->nsessions); /* @@ -449,19 +433,6 @@ run_permutation(TestSpec *testspec, int nsteps, Step **steps) Step **waiting; Step **errorstep; - /* - * In dry run mode, just display the permutation in the same format used - * by spec files, and return. - */ - if (dry_run) - { - printf("permutation"); - for (i = 0; i < nsteps; i++) - printf(" \"%s\"", steps[i]->name); - printf("\n"); - return; - } - waiting = pg_malloc(sizeof(Step *) * testspec->nsessions); errorstep = pg_malloc(sizeof(Step *) * testspec->nsessions); -- 2.40.0