tests: Fix selection of python version
According to documentation (and personal experience), AM_PATH_PYTHON selects the highest version of python, no matter if major version is different, which means if both python2 and 3 are available, 3 will be chosen an PYTHON will point to "/.../python" which is python3. Apparently, the macro cannot be easily used to pick highest python2 version. As {vty,ctrl}_test_runner.py require python2 and are incompatible with python3, let's instead rely on the system having a "python2" binary available, which is the case in most distros. Change-Id: If8e57924ed2c8da7ab7692f58a4bb5c5a970484f
This commit is contained in:
parent
dc730a3173
commit
2f89547fc9
|
@ -170,7 +170,10 @@ AC_ARG_ENABLE([external_tests],
|
||||||
[Include the VTY/CTRL tests in make check [default=no]]),
|
[Include the VTY/CTRL tests in make check [default=no]]),
|
||||||
[enable_ext_tests="$enableval"],[enable_ext_tests="no"])
|
[enable_ext_tests="$enableval"],[enable_ext_tests="no"])
|
||||||
if test "x$enable_ext_tests" = "xyes" ; then
|
if test "x$enable_ext_tests" = "xyes" ; then
|
||||||
AM_PATH_PYTHON
|
AC_CHECK_PROG(PYTHON2_AVAIL,python2,yes)
|
||||||
|
if test "x$PYTHON2_AVAIL" != "xyes" ; then
|
||||||
|
AC_MSG_ERROR([Please install python2 to run the VTY/CTRL tests.])
|
||||||
|
fi
|
||||||
AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes)
|
AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes)
|
||||||
if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then
|
if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then
|
||||||
AC_MSG_ERROR([Please install git://osmocom.org/python/osmo-python-tests to run the VTY/CTRL tests.])
|
AC_MSG_ERROR([Please install git://osmocom.org/python/osmo-python-tests to run the VTY/CTRL tests.])
|
||||||
|
|
|
@ -56,8 +56,8 @@ if ENABLE_EXT_TESTS
|
||||||
python-tests: $(BUILT_SOURCES)
|
python-tests: $(BUILT_SOURCES)
|
||||||
osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v
|
osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v
|
||||||
osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v
|
osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v
|
||||||
$(PYTHON) $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v
|
$(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v
|
||||||
$(PYTHON) $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v
|
$(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v
|
||||||
rm -f $(top_builddir)/sms.db $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count
|
rm -f $(top_builddir)/sms.db $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count
|
||||||
else
|
else
|
||||||
python-tests: $(BUILT_SOURCES)
|
python-tests: $(BUILT_SOURCES)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python2
|
||||||
|
|
||||||
# (C) 2013 by Jacob Erlbeck <jerlbeck@sysmocom.de>
|
# (C) 2013 by Jacob Erlbeck <jerlbeck@sysmocom.de>
|
||||||
# (C) 2014 by Holger Hans Peter Freyther
|
# (C) 2014 by Holger Hans Peter Freyther
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python2
|
||||||
|
|
||||||
# (C) 2013 by Katerina Barone-Adesi <kat.obsc@gmail.com>
|
# (C) 2013 by Katerina Barone-Adesi <kat.obsc@gmail.com>
|
||||||
# (C) 2013 by Holger Hans Peter Freyther
|
# (C) 2013 by Holger Hans Peter Freyther
|
||||||
|
|
Loading…
Reference in New Issue