aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2013-07-28 16:15:41 +0200
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2013-07-30 21:24:26 +0200
commitc0a6938d0ede31b7c94e74ad598efb952aa2a613 (patch)
tree4b4ed9082091555ff2c7fe0c55d79041d25b8b74
parent904bc8023fcecdfd8ba5abe2b46d8e2fb56e8d3b (diff)
tests: Create tests directory and move the VTY testing into there
-rw-r--r--Makefile.am13
-rw-r--r--configure.ac1
-rw-r--r--tests/Makefile.am16
3 files changed, 18 insertions, 12 deletions
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