diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-07-28 16:15:41 +0200 |
|---|---|---|
| committer | Ivan Kluchnikov <kluchnikovi@gmail.com> | 2013-08-02 13:39:55 +0400 |
| commit | bb00704871d6d03a073f3a8a2e1e6da98046b856 (patch) | |
| tree | 4b4ed9082091555ff2c7fe0c55d79041d25b8b74 | |
| parent | 421fe79e390b75b3442ef5b28f3a7a4ce51b2837 (diff) | |
tests: Create tests directory and move the VTY testing into there
| -rw-r--r-- | Makefile.am | 13 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | tests/Makefile.am | 16 |
3 files changed, 18 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index e23a40fd..4cbc1147 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 6510bf47..58cbc35e 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 00000000..7581ea95 --- /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 |