Skip to content

Commit

Permalink
Use the default pg_config location
Browse files Browse the repository at this point in the history
  • Loading branch information
asavchkov committed Aug 23, 2023
1 parent daae165 commit 7851b30
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ TAP_TESTS = 1
PG_LIBS_INTERNAL += $(libpq_pgport)

ifdef USE_PGXS
PG_CONFIG ?= pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs)
include $(PGXS)
else
Expand Down Expand Up @@ -71,6 +70,8 @@ install-pg-probackup:
$(MAKE) -C $(pg_probackup_dir) install USE_PGXS=$(USE_PGXS) PG_CONFIG=$(PG_CONFIG) top_srcdir=$(top_srcdir)

PYTEST_PROCESSES ?= $(shell nproc)
# Python tests read pg_config only from PG_CONFIG
test-python: PG_CONFIG ?= pg_config
test-python:
cd $(pg_probackup_dir); \
env="PG_PROBACKUP_PTRACK=ON PG_CONFIG=$(PG_CONFIG)"; \
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ You can control how tests are executed by using the following environment (or `m

| Variable | Possible values | Required | Default value | Description |
| - | - | - | - | - |
| PG_CONFIG | File path | No | pg_config for `test-python`, not set for other targets | The path to the `pg_config` binary. Can be set to specify a custom location of `pg_config`. |
| TESTS | A Pytest filter expression | No | Not set (run all Python tests) | A filter to include only selected tests into the run. See the Pytest `-k` option for more information. This variable is only applicable to `test-python` for the tests located in [tests](https://github.com/postgrespro/pg_probackup/tree/master/tests). |
| TEST_MODE | normal, legacy, paranoia | No | normal | The "legacy" mode runs tests in an environment similar to a 32-bit Windows system. This mode is only applicable to `test-tap`. The "paranoia" mode compares the checksums of each block of the database catalog (PGDATA) contents before making a backuo and after the restoration. This mode is only applicable to `test-python`.|

Expand Down

0 comments on commit 7851b30

Please sign in to comment.