From b1dc0305d3201c6f1e1cd41efb3f59e940665d30 Mon Sep 17 00:00:00 2001 From: Mats Kindahl Date: Fri, 22 Jan 2021 13:14:59 +0100 Subject: [PATCH] Fix path to dist_gapfill The `TEST_OUTPUT_DIR` for shared tests `dist_gapfill` is incorrect inside the test file (when called from `pg_regress`) because `TEST_OUTPUT_DIR` is set to the parent directory rather than the subdirectory. This commit fixes the paths in `dist_gapfill`. --- tsl/test/shared/sql/dist_gapfill.sql | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tsl/test/shared/sql/dist_gapfill.sql b/tsl/test/shared/sql/dist_gapfill.sql index cafa3faeb..8cbf09b0b 100644 --- a/tsl/test/shared/sql/dist_gapfill.sql +++ b/tsl/test/shared/sql/dist_gapfill.sql @@ -7,12 +7,12 @@ \set TEST_BASE_NAME dist_gapfill \set TEST_METRICS_NAME gapfill_metrics SELECT format('include/%s_query.sql', :'TEST_BASE_NAME') AS "TEST_QUERY_NAME", - format('%s/results/%s_singlenode.out', :'TEST_OUTPUT_DIR', :'TEST_BASE_NAME') AS "TEST_SINGLENODE", - format('%s/results/%s_partitionwise_off.out', :'TEST_OUTPUT_DIR', :'TEST_BASE_NAME') AS "TEST_PARTITIONWISE_OFF", - format('%s/results/%s_partitionwise_on.out', :'TEST_OUTPUT_DIR', :'TEST_BASE_NAME') AS "TEST_PARTITIONWISE_ON", + format('%s/shared/results/%s_singlenode.out', :'TEST_OUTPUT_DIR', :'TEST_BASE_NAME') AS "TEST_SINGLENODE", + format('%s/shared/results/%s_partitionwise_off.out', :'TEST_OUTPUT_DIR', :'TEST_BASE_NAME') AS "TEST_PARTITIONWISE_OFF", + format('%s/shared/results/%s_partitionwise_on.out', :'TEST_OUTPUT_DIR', :'TEST_BASE_NAME') AS "TEST_PARTITIONWISE_ON", format('include/%s_query.sql', :'TEST_METRICS_NAME') AS "TEST_METRICS_QUERY_NAME", - format('%s/results/%s_nohyper.out', :'TEST_OUTPUT_DIR', :'TEST_METRICS_NAME') AS "TEST_METRICS_NOHYPER", - format('%s/results/%s_partitionwise_off.out', :'TEST_OUTPUT_DIR', :'TEST_METRICS_NAME') AS "TEST_METRICS_PARTITIONWISE_OFF" \gset + format('%s/shared/results/%s_nohyper.out', :'TEST_OUTPUT_DIR', :'TEST_METRICS_NAME') AS "TEST_METRICS_NOHYPER", + format('%s/shared/results/%s_partitionwise_off.out', :'TEST_OUTPUT_DIR', :'TEST_METRICS_NAME') AS "TEST_METRICS_PARTITIONWISE_OFF" \gset SELECT format('\! diff %s %s', :'TEST_SINGLENODE', :'TEST_PARTITIONWISE_OFF') AS "DIFF_CMD_PARTITIONWISE_OFF", format('\! diff %s %s', :'TEST_SINGLENODE', :'TEST_PARTITIONWISE_ON') AS "DIFF_CMD_PARTITIONWISE_ON",