From 1c5f4539ddb76b31756f0a1fdd9e3a489bba40d2 Mon Sep 17 00:00:00 2001 Message-Id: <1c5f4539ddb76b31756f0a1fdd9e3a489bba40d2.1715242013.git.mdw@distorted.org.uk> From: Mark Wooding Date: Mon, 8 Dec 2008 12:10:39 +0000 Subject: [PATCH] Add testing infrastructure. Organization: Straylight/Edgeware From: Mark Wooding --- .links | 2 ++ Makefile.am | 3 +++ configure.ac | 6 +++++- debian/rules | 1 + t/.gitignore | 5 +++++ t/Makefile.am | 33 +++++++++++++++++++++++++++++++++ t/atlocal.in | 29 +++++++++++++++++++++++++++++ 7 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 t/.gitignore create mode 100644 t/Makefile.am create mode 100644 t/atlocal.in diff --git a/.links b/.links index dd8b261f..2ff0b6ab 100644 --- a/.links +++ b/.links @@ -1,2 +1,4 @@ COPYING config/confsubst +t/autotest.am +t/testsuite.at diff --git a/Makefile.am b/Makefile.am index 53779bcc..21412150 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,6 +53,9 @@ if HAVE_PYGTK SUBDIRS += mon endif +## Testing. +SUBDIRS += t + ###-------------------------------------------------------------------------- ### The pkg-config file. diff --git a/configure.ac b/configure.ac index 40fa5827..58ee877f 100644 --- a/configure.ac +++ b/configure.ac @@ -38,6 +38,8 @@ AX_CFLAGS_WARN_ALL AC_CANONICAL_HOST AM_PROG_LIBTOOL +AC_CHECK_PROGS([AUTOM4TE], [autom4te]) + dnl-------------------------------------------------------------------------- dnl C programming environment. @@ -283,6 +285,7 @@ dnl-------------------------------------------------------------------------- dnl Produce output. AC_CONFIG_HEADER([config/config.h]) +AC_CONFIG_TESTDIR([t]) AC_CONFIG_FILES( [Makefile] @@ -294,7 +297,8 @@ AC_CONFIG_FILES( [wireshark/Makefile] [init/Makefile] [keys/Makefile] - [mon/Makefile]) + [mon/Makefile] + [t/Makefile t/atlocal]) AC_OUTPUT dnl ----- That's all, folks ------------------------------------------------- diff --git a/debian/rules b/debian/rules index e48ae073..6df30ce6 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,7 @@ include $(CDBS)/class/autotools.mk ### General settings. DEB_BUILDDIR = $(CURDIR)/build +DEB_MAKE_CHECK_TARGET = check ###-------------------------------------------------------------------------- ### Correct configuration. diff --git a/t/.gitignore b/t/.gitignore new file mode 100644 index 00000000..8392db09 --- /dev/null +++ b/t/.gitignore @@ -0,0 +1,5 @@ +autotest.am +package.m4 +testsuite.at +testsuite +tests.m4 diff --git a/t/Makefile.am b/t/Makefile.am new file mode 100644 index 00000000..02665478 --- /dev/null +++ b/t/Makefile.am @@ -0,0 +1,33 @@ +### -*-makefile-*- +### +### Build script for test suite +### +### (c) 2008 Straylight/Edgeware +### + +###----- Licensing notice --------------------------------------------------- +### +### This file is part of Trivial IP Encryption (TrIPE). +### +### TrIPE is free software; you can redistribute it and/or modify +### it under the terms of the GNU General Public License as published by +### the Free Software Foundation; either version 2 of the License, or +### (at your option) any later version. +### +### TrIPE is distributed in the hope that it will be useful, +### but WITHOUT ANY WARRANTY; without even the implied warranty of +### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +### GNU General Public License for more details. +### +### You should have received a copy of the GNU General Public License +### along with TrIPE; if not, write to the Free Software Foundation, +### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +include autotest.am + +autotest_TESTS = + +###-------------------------------------------------------------------------- +### Test directories. + +###----- That's all, folks -------------------------------------------------- diff --git a/t/atlocal.in b/t/atlocal.in new file mode 100644 index 00000000..c5a355f8 --- /dev/null +++ b/t/atlocal.in @@ -0,0 +1,29 @@ +### -*-sh-*- +### +### Configuration variables interesting to the test suite +### +### (c) 2008 Straylight/Edgeware +### + +###----- Licensing notice --------------------------------------------------- +### +### This file is part of Trivial IP Encryption (TrIPE). +### +### TrIPE is free software; you can redistribute it and/or modify +### it under the terms of the GNU General Public License as published by +### the Free Software Foundation; either version 2 of the License, or +### (at your option) any later version. +### +### TrIPE is distributed in the hope that it will be useful, +### but WITHOUT ANY WARRANTY; without even the implied warranty of +### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +### GNU General Public License for more details. +### +### You should have received a copy of the GNU General Public License +### along with TrIPE; if not, write to the Free Software Foundation, +### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +###-------------------------------------------------------------------------- +### Configuration snippets. + +###----- That's all, folks -------------------------------------------------- -- [mdw]