diff options
| author | Jan Pokorný <jpokorny@redhat.com> | 2014-09-29 15:23:34 +0200 |
|---|---|---|
| committer | Jan Pokorný <jpokorny@redhat.com> | 2014-09-29 16:08:48 +0200 |
| commit | 4ada7628f151ce66c4113cfe04f2145e9cae0817 (patch) | |
| tree | 48aa74ee0d72cb8a4fce6ac349ffad62e5cae811 /__root__/run-check | |
| parent | 2b7eb0ec709dc50d1fc6cf4bf61566fe29e7b794 (diff) | |
| download | clufter-4ada7628f151ce66c4113cfe04f2145e9cae0817.tar.gz clufter-4ada7628f151ce66c4113cfe04f2145e9cae0817.tar.xz clufter-4ada7628f151ce66c4113cfe04f2145e9cae0817.zip | |
run-{check,tests}: limit inferference with user's modules
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
Diffstat (limited to '__root__/run-check')
| -rwxr-xr-x | __root__/run-check | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/__root__/run-check b/__root__/run-check index e11006c..2a41c36 100755 --- a/__root__/run-check +++ b/__root__/run-check @@ -15,17 +15,19 @@ PATH="${PATH:+${PATH}:}$( )" unset s +PYTHONEXEC="python -Es" + echo "Current path: ${PATH}" which ccs_flatten 2>/dev/null || ( cd __root__ 2>/dev/null || : - python setup.py pkg_prepare --build-develop #&& make -C ccs-flatten symlink + ${PYTHONEXEC} setup.py pkg_prepare --build-develop #&& make -C ccs-flatten symlink ln -fs -- build/ccs_flatten . ) || { ret=$?; echo "ccs_flatten missing, cannot be built"; exit ${ret}; } if [ $# -eq 0 ]; then # self-check for sanity usage declare testcib="$(mktemp)" testcoro="$(mktemp)" - { ./run-dev ccs2pcs-needle - "${testcib}" "${testcoro}" \ + { ${PYTHONEXEC} run-dev ccs2pcs-needle - "${testcib}" "${testcoro}" \ && echo "TEST: execution OK" \ || { echo "TEST: execution FAIL"; ret=20; }; }<<EOF <?xml version="1.0"?> @@ -70,7 +72,7 @@ EOF { diff -u "${testcib}" - \ && echo "TEST: cib diff OK" \ || { echo "TEST: cib diff FAIL"; ret=21; }; }<<EOF -<cib validate-with="pacemaker-1.2" admin_epoch="1" epoch="1" num_updates="0" update-client="$(./run-dev --version | head -n1)"> +<cib validate-with="pacemaker-1.2" admin_epoch="1" epoch="1" num_updates="0" update-client="$(${PYTHONEXEC} run-dev --version | head -n1)"> <configuration> <crm_config/> <nodes> |