1
0
mirror of https://github.com/nmap/nmap.git synced 2026-01-27 00:29:03 +00:00

Add Ndiff tests to "make check"

This commit is contained in:
dmiller
2014-01-10 16:26:42 +00:00
parent 434efb1266
commit 393b4b21ee
3 changed files with 11 additions and 1 deletions

View File

@@ -394,13 +394,16 @@ nse_check:
ncat_check:
@cd $(NCATDIR) && $(MAKE) check
ndiff_check:
@cd $(NDIFFDIR) && $(PYTHON) ndifftest.py
nsock_check:
@cd $(NSOCKDIR)/src && $(MAKE) check
zenmap_check:
@cd $(ZENMAPDIR) && $(PYTHON) -m unittest discover build/lib.* '*.py'
check: @NCAT_CHECK@ @NSOCK_CHECK@ @ZENMAP_CHECK@ @NSE_CHECK@
check: @NCAT_CHECK@ @NSOCK_CHECK@ @ZENMAP_CHECK@ @NSE_CHECK@ @NDIFF_CHECK@
${srcdir}/configure: configure.ac
cd ${srcdir} && autoconf

4
configure vendored
View File

@@ -689,6 +689,7 @@ BUILDZENMAP
ZENMAPDIR
NDIFF_DIST_CLEAN
NDIFF_CLEAN
NDIFF_CHECK
INSTALLNDIFF
BUILDNDIFF
NDIFFDIR
@@ -5688,11 +5689,13 @@ fi
if test "$with_ndiff" = "no"; then
BUILDNDIFF=""
INSTALLNDIFF=""
NDIFF_CHECK=""
NDIFF_CLEAN=""
NDIFF_DIST_CLEAN=""
else
BUILDNDIFF=build-ndiff
INSTALLNDIFF=install-ndiff
NDIFF_CHECK="ndiff_check"
NDIFF_CLEAN=ndiff_clean
NDIFF_DIST_CLEAN=ndiff_dist_clean
fi
@@ -5702,6 +5705,7 @@ fi
ZENMAPDIR=zenmap
# Do they want Zenmap?

View File

@@ -218,17 +218,20 @@ fi
if test "$with_ndiff" = "no"; then
BUILDNDIFF=""
INSTALLNDIFF=""
NDIFF_CHECK=""
NDIFF_CLEAN=""
NDIFF_DIST_CLEAN=""
else
BUILDNDIFF=build-ndiff
INSTALLNDIFF=install-ndiff
NDIFF_CHECK="ndiff_check"
NDIFF_CLEAN=ndiff_clean
NDIFF_DIST_CLEAN=ndiff_dist_clean
fi
AC_SUBST(NDIFFDIR)
AC_SUBST(BUILDNDIFF)
AC_SUBST(INSTALLNDIFF)
AC_SUBST(NDIFF_CHECK)
AC_SUBST(NDIFF_CLEAN)
AC_SUBST(NDIFF_DIST_CLEAN)