Implement "make check" for zenmap

Currently, this just uses Python's unittest module to autodiscover
tests, which may skip some, but is better than nothing. TODO: move tests
to their own module and let the zenmap_check target test them directly.
This commit is contained in:
dmiller 2014-01-09 16:39:39 +00:00
parent 3c9eeb3608
commit 96141b431e
3 changed files with 11 additions and 1 deletions

View file

@ -394,7 +394,10 @@ ncat_check:
nsock_check:
@cd $(NSOCKDIR)/src && $(MAKE) check
check: @NCAT_CHECK@ @NSOCK_CHECK@
zenmap_check:
@cd $(ZENMAPDIR) && $(PYTHON) -m unittest discover build/lib.* '*.py'
check: @NCAT_CHECK@ @NSOCK_CHECK@ @ZENMAP_CHECK@
${srcdir}/configure: configure.ac
cd ${srcdir} && autoconf

4
configure vendored
View file

@ -681,6 +681,7 @@ NPINGDIR
subdirs
ZENMAP_DIST_CLEAN
ZENMAP_CLEAN
ZENMAP_CHECK
UNINSTALLZENMAP
INSTALLZENMAP
BUILDZENMAP
@ -5953,12 +5954,14 @@ if test "$with_zenmap" = "no"; then
BUILDZENMAP=""
INSTALLZENMAP=""
UNINSTALLZENMAP=""
ZENMAP_CHECK=""
ZENMAP_CLEAN=""
ZENMAP_DIST_CLEAN=""
else
BUILDZENMAP=build-zenmap
INSTALLZENMAP=install-zenmap
UNINSTALLZENMAP=uninstall-zenmap
ZENMAP_CHECK=zenmap_check
ZENMAP_CLEAN=zenmap_clean
ZENMAP_DIST_CLEAN=zenmap_dist_clean
fi
@ -5969,6 +5972,7 @@ fi
NPINGDIR=nping
# Do they want Nping?

View file

@ -250,12 +250,14 @@ if test "$with_zenmap" = "no"; then
BUILDZENMAP=""
INSTALLZENMAP=""
UNINSTALLZENMAP=""
ZENMAP_CHECK=""
ZENMAP_CLEAN=""
ZENMAP_DIST_CLEAN=""
else
BUILDZENMAP=build-zenmap
INSTALLZENMAP=install-zenmap
UNINSTALLZENMAP=uninstall-zenmap
ZENMAP_CHECK=zenmap_check
ZENMAP_CLEAN=zenmap_clean
ZENMAP_DIST_CLEAN=zenmap_dist_clean
fi
@ -263,6 +265,7 @@ AC_SUBST(ZENMAPDIR)
AC_SUBST(BUILDZENMAP)
AC_SUBST(INSTALLZENMAP)
AC_SUBST(UNINSTALLZENMAP)
AC_SUBST(ZENMAP_CHECK)
AC_SUBST(ZENMAP_CLEAN)
AC_SUBST(ZENMAP_DIST_CLEAN)