Add testsute

17 files changed, 566 insertions, 3 deletions

diff --git a/Makefile.am b/Makefile.am
index 0358e8c..ff6f5db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@
 
 ACLOCAL_AMFLAGS = -I m4 -I am -I grecs/am -I imprimatur
 
-SUBDIRS=gnu grecs lib ident src imprimatur doc po 
+SUBDIRS=gnu grecs lib ident src tests imprimatur doc po
 
 dist-hook:
         @PATCHLEV=`echo "$(PACKAGE_VERSION)" | \
diff --git a/configure.ac b/configure.ac
index 78702b4..6ee1084 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,6 +142,11 @@ AC_ARG_VAR([EMERGENCY_SHELL],[Filename of the emergency shell])
            
 IMPRIMATUR_INIT
 
+# Initialize the test suite.
+AC_CONFIG_TESTDIR(tests)
+AC_CONFIG_FILES([tests/Makefile tests/atlocal]) 
+AM_MISSING_PROG([AUTOM4TE], [autom4te])
+
 AC_CONFIG_FILES([Makefile
                  gnu/Makefile
                  lib/Makefile
diff --git a/doc/pies.texi b/doc/pies.texi
index 15c37e1..0e8af70 100644
--- a/doc/pies.texi
+++ b/doc/pies.texi
@@ -1868,7 +1868,7 @@ The table below lists all available variables and their expansions:
 @headitem Variable @tab Expansion
 @item canonical_program_name @tab @samp{pies}
 @item program_name @tab Program name of the @command{pies} binary.
-@item package      @tab Package name (@samp{Pies}).
+@item package      @tab Package name (@samp{GNU Pies}).
 @item instance     @tab Instance name (@pxref{instances}).
 @item version      @tab Package version (@value{VERSION}).
 @item component    @tab Name of the terminated component.
diff --git a/src/progman.c b/src/progman.c
index 5693011..fdb829a 100644
--- a/src/progman.c
+++ b/src/progman.c
@@ -2078,7 +2078,7 @@ notify (const char *tag, int status, struct action *act)
 #define INSTANCE_IDX 3
     "instance", NULL,
     "canonical_program_name", "pies",
-    "package", PACKAGE,
+    "package", PACKAGE_NAME,
     "version", PACKAGE_VERSION,
     NULL
   };
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 0000000..93f8f46
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1,6 @@
+atconfig
+atlocal
+package.m4
+testsuite
+testsuite.dir
+testsuite.log
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..668fe5e
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,71 @@
+# This file is part of GNU Pies.
+# Copyright (C) 2008-2016 Sergey Poznyakoff
+#
+# GNU Pies 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 3, or (at your option)
+# any later version.
+#
+# GNU Pies 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 GNU Pies.  If not, see <http://www.gnu.org/licenses/>.
+
+EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4 respawn retcode mailer
+DISTCLEANFILES       = atconfig $(check_SCRIPTS)
+MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
+
+## ------------ ##
+## package.m4.  ##
+## ------------ ##
+
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac
+        {                                      \
+          echo '# Signature of the current package.'; \
+          echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
+          echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
+          echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
+          echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
+          echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+        } >$(srcdir)/package.m4
+
+#
+
+## ------------ ##
+## Test suite.  ##
+## ------------ ##
+
+TESTSUITE_AT = \
+ testsuite.at\
+ control.at\
+ respawn.at\
+ redirect.at\
+ ret-exec.at\
+ ret-notify.at\
+ version.at
+
+TESTSUITE = $(srcdir)/testsuite
+M4=m4
+
+AUTOTEST = $(AUTOM4TE) --language=autotest
+$(TESTSUITE): package.m4 $(TESTSUITE_AT)
+        $(AM_V_GEN)$(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
+        $(AM_V_at)mv $@.tmp $@
+
+atconfig: $(top_builddir)/config.status 
+        cd $(top_builddir) && ./config.status tests/$@
+
+clean-local:
+        @test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean
+
+check-local: atconfig atlocal $(TESTSUITE)
+        @$(SHELL) $(TESTSUITE)
+
+# Run the test suite on the *installed* tree.
+#installcheck-local:
+#       $(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
+
+
diff --git a/tests/atlocal.in b/tests/atlocal.in
new file mode 100644
index 0000000..6cb3c43
--- /dev/null
+++ b/tests/atlocal.in
@@ -0,0 +1,6 @@
+# @configure_input@                                     -*- shell-script -*-
+# Configurable variable values for GNU Pies test suite.
+# Copyright (C) 2016 Sergey Poznyakoff
+
+PATH=@abs_builddir@:@abs_top_builddir@/src:$srcdir:$PATH
+XFAILFILE=$abs_builddir/.badversion
diff --git a/tests/control.at b/tests/control.at
new file mode 100644
index 0000000..95befdf
--- /dev/null
+++ b/tests/control.at
@@ -0,0 +1,55 @@
+# This file is part of GNU pies testsuite. -*- Autotest -*-
+# Copyright (C) 2016 Sergey Poznyakoff
+#
+# GNU pies 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 3, or (at your option)
+# any later version.
+#
+# GNU pies 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 GNU pies.  If not, see <http://www.gnu.org/licenses/>.
+
+AT_SETUP([Control interface])
+
+AT_CHECK([
+PIES_XFAIL_CHECK
+PIES_CONTROL_INIT
+
+pies --config-file control.conf
+
+sleep 1
+if test -f $pidfile; then
+    pid0=`head -1 $pidfile`
+    pid1=`piesctl --url "$ctlsock" id PID|sed 's/^PID: //'`
+    if test "$pid1" = "$pid0"; then
+        if piesctl --url "$ctlsock" shutdown; then
+            sleep 1
+            if test -f $pidfile; then
+                PIES_XFAIL_MSG([pies does not respond to control commands])
+                kill -9 $pid0
+                exit 1
+            else
+                exit 0
+            fi
+        else
+            PIES_XFAIL_MSG([can't send control commands])
+            kill -9 $pid0
+            exit 1
+        fi
+    else
+        PIES_XFAIL_MSG([Control interface non-functional])
+        exit 1
+    fi
+else    
+    PIES_XFAIL_MSG([pies failed to start])
+    exit 1
+fi
+],
+[0])
+
+AT_CLEANUP
diff --git a/tests/mailer b/tests/mailer
new file mode 100755
index 0000000..f832ff5
--- /dev/null
+++ b/tests/mailer
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+exec >${1:?}
+shift
+echo $*
+cat -
+
diff --git a/tests/redirect.at b/tests/redirect.at
new file mode 100644
index 0000000..e8d98d8
--- /dev/null
+++ b/tests/redirect.at
@@ -0,0 +1,60 @@
+# This file is part of GNU pies testsuite. -*- Autotest -*-
+# Copyright (C) 2016 Sergey Poznyakoff
+#
+# GNU pies 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 3, or (at your option)
+# any later version.