[PATCH 8/9] tests: Create tests directory and move the VTY testing into there

Alexander Chemeris alexander.chemeris at gmail.com
Wed Jul 31 05:48:36 UTC 2013


Hi Holger,

I don't see real files being moved (osmotestvty.py and
osmotestconfig.py). Probably you forgot to stage them?

On Tue, Jul 30, 2013 at 11:26 PM, Holger Hans Peter Freyther
<hfreyther at sysmocom.de> wrote:
> From: Holger Hans Peter Freyther <holger at moiji-mobile.com>
>
> ---
>  Makefile.am       | 13 +------------
>  configure.ac      |  1 +
>  tests/Makefile.am | 16 ++++++++++++++++
>  3 files changed, 18 insertions(+), 12 deletions(-)
>  create mode 100644 tests/Makefile.am
>
> diff --git a/Makefile.am b/Makefile.am
> index e23a40f..4cbc114 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -1,16 +1,5 @@
>  AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
>
> -SUBDIRS = src examples
> +SUBDIRS = src examples tests
>  EXTRA_DIST = osmoappdesc.py
>
> -if ENABLE_VTY_TESTS
> -python-tests: $(BUILT_SOURCES)
> -       osmotestvty.py -p $(top_srcdir) -w $(builddir) -v
> -       osmotestconfig.py -p $(top_srcdir) -w $(builddir) -v
> -else
> -python-tests: $(BUILT_SOURCES)
> -       @echo "Not running python-based tests (determined at configure-time)"
> -endif
> -
> -check-local: $(BUILT_SOURCES)
> -       $(MAKE) $(AM_MAKEFLAGS) python-tests
> diff --git a/configure.ac b/configure.ac
> index 6510bf4..58cbc35 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -60,4 +60,5 @@ AM_CONDITIONAL(ENABLE_VTY_TESTS, test "x$enable_vty_tests" = "xyes")
>  AC_OUTPUT(
>      src/Makefile
>      examples/Makefile
> +    tests/Makefile
>      Makefile)
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> new file mode 100644
> index 0000000..7581ea9
> --- /dev/null
> +++ b/tests/Makefile.am
> @@ -0,0 +1,16 @@
> +
> +
> +
> +# Python testing
> +if ENABLE_VTY_TESTS
> +python-tests: $(BUILT_SOURCES)
> +       osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v
> +       osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v
> +
> +else
> +python-tests: $(BUILT_SOURCES)
> +       @echo "Not running python-based tests (determined at configure-time)"
> +endif
> +
> +check-local: $(BUILT_SOURCES)
> +       $(MAKE) $(AM_MAKEFLAGS) python-tests
> --
> 1.8.3.2
>
>



-- 
Regards,
Alexander Chemeris.
CEO, Fairwaves LLC / ООО УмРадио
http://fairwaves.ru




More information about the osmocom-net-gprs mailing list