summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Slebodnik <lslebodn@redhat.com>2016-05-21 22:44:08 +0200
committerLukas Slebodnik <lslebodn@redhat.com>2017-10-16 15:11:25 +0200
commita3bed9df5a47bfc84b82341f0f7e693e2b14a67a (patch)
tree38c3a579eaa982e72a3c47285ad186e7efd3de81
parent035bed97b8da9a7f3a2d15bcf0e184bd973977a7 (diff)
downloadsssd-a3bed9df5a47bfc84b82341f0f7e693e2b14a67a.tar.gz
sssd-a3bed9df5a47bfc84b82341f0f7e693e2b14a67a.tar.xz
sssd-a3bed9df5a47bfc84b82341f0f7e693e2b14a67a.zip
intg: Let python paths be configurable
It will allow to prefer locally built python modules in integration tests. Reviewed-by: Fabiano FidĂȘncio <fidencio@redhat.com> Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
-rw-r--r--src/tests/intg/Makefile.am4
-rw-r--r--src/tests/intg/config.py.m44
2 files changed, 8 insertions, 0 deletions
diff --git a/src/tests/intg/Makefile.am b/src/tests/intg/Makefile.am
index f30cc762c..0acab288e 100644
--- a/src/tests/intg/Makefile.am
+++ b/src/tests/intg/Makefile.am
@@ -45,6 +45,10 @@ config.py: config.py.m4
-D "runstatedir=\`$(runstatedir)'" \
-D "abs_builddir=\`$(abs_builddir)'" \
-D "session_recording_shell=\`$(session_recording_shell)'" \
+ -D "py2execdir=\`$(py2execdir)'" \
+ -D "py3execdir=\`$(py3execdir)'" \
+ -D "python2dir=\`$(python2dir)'" \
+ -D "python3dir=\`$(python3dir)'" \
$< > $@
root:
diff --git a/src/tests/intg/config.py.m4 b/src/tests/intg/config.py.m4
index 20f9ec17a..6e011b692 100644
--- a/src/tests/intg/config.py.m4
+++ b/src/tests/intg/config.py.m4
@@ -17,3 +17,7 @@ LIBEXEC_PATH = "libexecpath"
RUNSTATEDIR = "runstatedir"
ABS_BUILDDIR = "abs_builddir"
SESSION_RECORDING_SHELL = "session_recording_shell"
+PY2EXECDIR = "py2execdir"
+PY2DIR = "python2dir"
+PY3EXECDIR = "py3execdir"
+PY3DIR = "python3dir"