From 0903091343d55c5626c2886a008d99fb02763ae9 Mon Sep 17 00:00:00 2001
From: Jelte Fennema <jelte.fennema@microsoft.com>
Date: Fri, 27 Jan 2023 16:01:59 +0100
Subject: [PATCH] Add valgrind support to run_test.py (#6667)

Running tests with valgrind was not possible with our run_test.py script
yet. This adds that support.
---
 src/test/regress/Makefile                | 16 ++++++++++++++++
 src/test/regress/citus_tests/run_test.py |  4 ++++
 2 files changed, 20 insertions(+)

diff --git a/src/test/regress/Makefile b/src/test/regress/Makefile
index 86c2f3996..368f8f8c5 100644
--- a/src/test/regress/Makefile
+++ b/src/test/regress/Makefile
@@ -128,6 +128,22 @@ check-isolation-custom-schedule: all  $(isolation_test_files)
 	$(pg_regress_multi_check) --load-extension=citus --isolationtester \
 	-- $(MULTI_REGRESS_OPTS) --inputdir=$(citus_abs_srcdir)/build --schedule=$(citus_abs_srcdir)/$(SCHEDULE) $(EXTRA_TESTS)
 
+check-custom-schedule-vg: all
+	$(pg_regress_multi_check) --load-extension=citus \
+	--valgrind --pg_ctl-timeout=360 --connection-timeout=500000 --valgrind-path=valgrind --valgrind-log-file=$(CITUS_VALGRIND_LOG_FILE) \
+	-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/$(SCHEDULE) $(EXTRA_TESTS)
+
+check-failure-custom-schedule-vg: all
+	$(pg_regress_multi_check) --load-extension=citus --mitmproxy \
+	--valgrind --pg_ctl-timeout=360 --connection-timeout=500000 --valgrind-path=valgrind --valgrind-log-file=$(CITUS_VALGRIND_LOG_FILE) \
+	-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/$(SCHEDULE) $(EXTRA_TESTS)
+
+check-isolation-custom-schedule-vg: all  $(isolation_test_files)
+	$(pg_regress_multi_check) --load-extension=citus --isolationtester \
+	--valgrind --pg_ctl-timeout=360 --connection-timeout=500000 --valgrind-path=valgrind --valgrind-log-file=$(CITUS_VALGRIND_LOG_FILE) \
+	-- $(MULTI_REGRESS_OPTS) --inputdir=$(citus_abs_srcdir)/build --schedule=$(citus_abs_srcdir)/$(SCHEDULE) $(EXTRA_TESTS)
+
+
 check-empty: all
 	$(pg_regress_multi_check) --load-extension=citus \
 	-- $(MULTI_REGRESS_OPTS) $(EXTRA_TESTS)
diff --git a/src/test/regress/citus_tests/run_test.py b/src/test/regress/citus_tests/run_test.py
index 783b594e4..a2a7fad8f 100755
--- a/src/test/regress/citus_tests/run_test.py
+++ b/src/test/regress/citus_tests/run_test.py
@@ -17,6 +17,7 @@ args.add_argument("-p", "--path", required=False, help="Relative path for test f
 args.add_argument("-r", "--repeat", help="Number of test to run", type=int, default=1)
 args.add_argument("-b", "--use-base-schedule", required=False, help="Choose base-schedules rather than minimal-schedules", action='store_true')
 args.add_argument("-w", "--use-whole-schedule-line", required=False, help="Use the whole line found in related schedule", action='store_true')
+args.add_argument("--valgrind", required=False, help="Run the test with valgrind enabled", action='store_true')
 
 args = vars(args.parse_args())
 
@@ -120,6 +121,9 @@ elif "failure" in test_schedule:
 else:
     make_recipe = 'check-custom-schedule'
 
+if args['valgrind']:
+    make_recipe += '-vg'
+
 # prepare command to run tests
 test_command = f"make -C {regress_dir} {make_recipe} SCHEDULE='{pathlib.Path(tmp_schedule_path).stem}'"