From 7b3e55f903ddd28ce47b5628d0122160d5019a7e Mon Sep 17 00:00:00 2001 From: Onur Tirtir Date: Wed, 2 Nov 2022 11:30:32 +0300 Subject: [PATCH 1/2] Add missing dependencies to test targets --- src/test/regress/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/test/regress/Makefile b/src/test/regress/Makefile index 7c42ed556..341fad159 100644 --- a/src/test/regress/Makefile +++ b/src/test/regress/Makefile @@ -190,7 +190,7 @@ check-isolation-base: all $(isolation_test_files) -- $(MULTI_REGRESS_OPTS) --inputdir=$(citus_abs_srcdir)/build --schedule=$(citus_abs_srcdir)/base_isolation_schedule $(EXTRA_TESTS) # ci takes regression.diffs output from another location, so copy diffs file at the end. -check-vanilla: +check-vanilla: all $(pg_regress_multi_check) --vanillatest || (cp $(vanilla_diffs_file) $(citus_abs_srcdir)/regression.diffs) check-multi-mx: all @@ -205,7 +205,7 @@ check-operations: all $(pg_regress_multi_check) --load-extension=citus \ -- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/operations_schedule $(EXTRA_TESTS) -check-columnar: +check-columnar: all $(pg_regress_multi_check) --load-extension=citus_columnar --load-extension=citus \ -- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/columnar_schedule $(EXTRA_TESTS) @@ -229,23 +229,23 @@ check-enterprise-failure: all $(pg_regress_multi_check) --load-extension=citus --mitmproxy \ -- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/enterprise_failure_schedule $(EXTRA_TESTS) -check-pg-upgrade: +check-pg-upgrade: all $(pg_upgrade_check) --old-bindir=$(old-bindir) --new-bindir=$(new-bindir) --pgxsdir=$(pgxsdir) -check-arbitrary-configs: +check-arbitrary-configs: all ${arbitrary_config_check} --bindir=$(bindir) --pgxsdir=$(pgxsdir) --parallel=$(parallel) --configs=$(CONFIGS) --seed=$(seed) -check-arbitrary-base: +check-arbitrary-base: all ${arbitrary_config_check} --bindir=$(bindir) --pgxsdir=$(pgxsdir) --parallel=$(parallel) --configs=$(CONFIGS) --seed=$(seed) --base -check-citus-upgrade: +check-citus-upgrade: all $(citus_upgrade_check) \ --bindir=$(bindir) \ --pgxsdir=$(pgxsdir) \ --citus-pre-tar=$(citus-pre-tar) \ --citus-post-tar=$(citus-post-tar) -check-citus-upgrade-mixed: +check-citus-upgrade-mixed: all $(citus_upgrade_check) \ --bindir=$(bindir) \ --pgxsdir=$(pgxsdir) \ @@ -253,13 +253,13 @@ check-citus-upgrade-mixed: --citus-post-tar=$(citus-post-tar) \ --mixed -check-citus-upgrade-local: clean-upgrade-artifacts +check-citus-upgrade-local: all clean-upgrade-artifacts $(citus_upgrade_check) \ --bindir=$(bindir) \ --pgxsdir=$(pgxsdir) \ --citus-old-version=$(citus-old-version) -check-citus-upgrade-mixed-local: clean-upgrade-artifacts +check-citus-upgrade-mixed-local: all clean-upgrade-artifacts $(citus_upgrade_check) \ --bindir=$(bindir) \ --pgxsdir=$(pgxsdir) \ From e0363470bc7e4e78201e2d2e9704f7f6fbdbb10d Mon Sep 17 00:00:00 2001 From: Onur Tirtir Date: Wed, 2 Nov 2022 11:42:00 +0300 Subject: [PATCH 2/2] Add missing targets to check-full --- src/test/regress/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/regress/Makefile b/src/test/regress/Makefile index 341fad159..33c2a600c 100644 --- a/src/test/regress/Makefile +++ b/src/test/regress/Makefile @@ -44,9 +44,9 @@ vanilla_diffs_file = $(citus_abs_srcdir)/pg_vanilla_outputs/$(MAJORVERSION)/regr # intermediate, for muscle memory backward compatibility. check: check-full check-enterprise-full # check-full triggers all tests that ought to be run routinely -check-full: check-multi check-multi-mx check-multi-1 check-operations check-follower-cluster check-isolation check-failure check-split +check-full: check-multi check-multi-mx check-multi-1 check-operations check-follower-cluster check-isolation check-failure check-split check-vanilla check-columnar check-columnar-isolation check-pg-upgrade check-arbitrary-configs check-citus-upgrade check-citus-upgrade-mixed check-citus-upgrade-local check-citus-upgrade-mixed-local # check-enterprise-full triggers all enterprise specific tests -check-enterprise-full: check-enterprise check-enterprise-isolation check-enterprise-failure +check-enterprise-full: check-enterprise check-enterprise-isolation check-enterprise-failure check-enterprise-isolation-logicalrep-1 check-enterprise-isolation-logicalrep-2 check-enterprise-isolation-logicalrep-3 ISOLATION_DEPDIR=.deps/isolation