diff options
| -rw-r--r-- | Makefile.am | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index d108fef..bc94a1c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,20 +38,21 @@ FMT="\n\n%s\n%s\n" SEPARATOR=`printf "%s%s" \ "----------------------------------------------" \ "------------------------"` -PYTHONPATH_FOR_TESTS=`printf "%s"` \ - "@prefix@/lib/Python@PYTHON_VERSION@/site-packages" +PYTHONPATH_APPEND=`printf "%s" \ + "@prefix@/lib/Python@PYTHON_VERSION@/site-packages"` check: - @export PYTHONPATH="${PYTHONPATH_FOR_TESTS}:${PYTHONPATH}" @export DJANGO_SETTINGS_MODULE="talerbank.settings" \ TALER_PREFIX="@prefix@" \ TALER_CONFIG_FILE="bank-check.conf" \ + PYTHONPATH="${PYTHONPATH_APPEND}:${PYTHONPATH}" \ && python3 -m django test --no-input talerbank.app.tests @printf ${FMT} ${SEPARATOR} \ "Testing against non existent config file" @export DJANGO_SETTINGS_MODULE="talerbank.settings" \ TALER_PREFIX="@prefix@" \ TALER_CONFIG_FILE="non-existent.conf" \ + PYTHONPATH="${PYTHONPATH_APPEND}:${PYTHONPATH}" \ && python3 \ -m django test \ --no-input talerbank.app.tests ; \ @@ -60,7 +61,8 @@ check: "Testing against bad db string" @export DJANGO_SETTINGS_MODULE="talerbank.settings" \ TALER_PREFIX="@prefix@" \ - export TALER_BANK_ALTDB="bad db string" \ + TALER_BANK_ALTDB="bad db string" \ + PYTHONPATH="${PYTHONPATH_APPEND}:${PYTHONPATH}" \ && python3 \ -m django test \ --no-input \ @@ -71,6 +73,7 @@ check: @export DJANGO_SETTINGS_MODULE="talerbank.settings" \ TALER_PREFIX="@prefix@" \ TALER_CONFIG_FILE="bank-check-alt-badamount.conf" \ + PYTHONPATH="${PYTHONPATH_APPEND}:${PYTHONPATH}" \ && python3 \ -m django test \ --no-input \ @@ -81,6 +84,7 @@ check: DJANGO_SETTINGS_MODULE="talerbank.settings" \ TALER_PREFIX="@prefix@" \ TALER_CONFIG_FILE="bank-check-alt-nocurrency.conf" \ + PYTHONPATH="${PYTHONPATH_APPEND}:${PYTHONPATH}" \ && python3 \ -m django test \ --no-input \ @@ -91,15 +95,16 @@ check: @export DJANGO_SETTINGS_MODULE="talerbank.settings" \ TALER_PREFIX="@prefix@" \ TALER_BANK_ALTDB="postgres:///idontexist" \ + PYTHONPATH="${PYTHONPATH_APPEND}:${PYTHONPATH}" \ && python3 ./taler-bank-manage serve-uwsgi ; \ test 4 = $$? # install into prefix install-exec-hook: - @pip3 install . --install-option="--prefix=@prefix@" \ - @DEBIAN_PIP3_SYSTEM@ + @pip3 install . @DEBIAN_PIP3_SYSTEM@ \ + --target="${PYTHONPATH_APPEND}" @# force update when sources changed - @pip3 install . --install-option="--prefix=@prefix@" \ + @pip3 install . --target="${PYTHONPATH_APPEND}" \ @DEBIAN_PIP3_SYSTEM@ --upgrade --no-deps pylint: |