Rewrite the testsuite

The aim is to run pies in foreground if possible. Limit execution time
using external wrapper.

* src/pies.c: (_cb_redir): Consistently return 1 on errors.

* tests/aux/sleepexit: New file.
* tests/aux/startcheck: New file.
* tests/aux/touchfile: Change arguments.
* tests/aux/respawn: Rewrite.

* tests/lines.c: New noinst program.
* tests/to.c: New noinst program.
* tests/.gitignore: Add new programs.
* tests/Makefile.am: Update.
* tests/env.at: Use to to avoid hanging forever.
Add missing popdef.
* tests/redirect.at: Use echo as component program.
* tests/respawn.at: Run pies in foreground. Use to to limit execution
time.
* tests/shell.at: Likewise.
* tests/shutdown.at: Likewise.
* tests/startup.at: Likewise.
* tests/ret-exec.at: Use sleepexit as component program.
* tests/ret-notify.at: Likewise.

16 files changed, 255 insertions, 187 deletions

diff --git a/tests/.gitignore b/tests/.gitignore
index 276645a..459fa44 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,7 +1,9 @@
 atconfig
 atlocal
 envtest
+lines
 package.m4
 testsuite
 testsuite.dir
 testsuite.log
+to
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 419818b..14f5b4f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,7 +18,9 @@ AUXTOOLS = \
  aux/respawn\
  aux/retcode\
  aux/mailer\
- aux/touchfile
+ aux/touchfile\
+ aux/sleepexit\
+ aux/startcheck
 
 EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4 $(AUXTOOLS)
 DISTCLEANFILES       = atconfig $(check_SCRIPTS)
@@ -62,7 +64,7 @@ TESTSUITE_AT = \
 TESTSUITE = $(srcdir)/testsuite
 M4=m4
 
-noinst_PROGRAMS = envtest
+noinst_PROGRAMS = envtest to lines
 AM_CPPFLAGS = \
  -I$(top_srcdir)/lib\
  @GRECS_INCLUDES@
diff --git a/tests/aux/respawn b/tests/aux/respawn
index cd9687a..afed85b 100755
--- a/tests/aux/respawn
+++ b/tests/aux/respawn
@@ -1,63 +1,22 @@
 #! /bin/sh
 
-# usage: respawn [-append] [-stderr FILE] [-stdout FILE] [-sleep TIME]
-#                [-pid FILE] [-tag STRING] [-exit CODE]
-
-append=0
-unset name
-time=1
-tag=$0
-code=0
-
-while [ $# -ne 0 ]
-do
-    arg=$1
-    shift
-    case $arg in
-        -append)
-            append=1;;
-        -stderr)
-            name=${1:?missing argument for -stderr}
-            shift
-            if [ $append -eq 1 ]; then
-                exec 2>>$name
-                append=0
-            else
-                exec 2>$name
-            fi;;
-        -stdout)
-            name=${1:?missing argument for -stdout}
-            shift
-            if [ $append -eq 1 ]; then
-                exec >>$name
-                append=0
-            else
-                exec >$name
-            fi;;
-        -sleep)
-            time=${1:?missing argument for -sleep}
-            shift;;
-        -pid)
-            name=${1:?missing argument for -pid}
-            shift
-            if [ $append -eq 1 ]; then
-                echo $$ >>$name
-                append=0
-            else
-                echo $$ >$name
-            fi;;
-        -tag)
-            tag=${1:?missing argument for -tag}
-            shift;;
-        -exit)
-            code=${1:?missing argument for -exit}
-            shift;;         
-        *)  echo >&2 "$tag: invalid argument: $arg"
+# usage: respawn FILE COUNT 
+
+file=${1:?}
+maxcount=${2:?}
+
+count=0
+
+if [ -f $file ]; then
+    count=`cat $file`
+    if test -n "$count" && test $count -ge $maxcount; then
        exit 1
-    esac
-done
+    fi
+fi
+
+count=$(($count + 1))
+echo "$count" > $file
+
+exit 0
+
        
-echo "$tag: start"
-sleep $time
-echo "$tag: stop"
-exit $code
diff --git a/tests/aux/sleepexit b/tests/aux/sleepexit
new file mode 100755
index 0000000..25a9a5b
--- /dev/null
+++ b/tests/aux/sleepexit
@@ -0,0 +1,8 @@
+#! /bin/sh
+t=${1:?}
+c=${2:?}
+if test -n "$3"; then
+    echo $$ > $3
+fi    
+sleep $t
+exit $c
diff --git a/tests/aux/startcheck b/tests/aux/startcheck
new file mode 100755
index 0000000..6e84959
--- /dev/null
+++ b/tests/aux/startcheck
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# usage: startcheck FILE...
+
+for file
+do
+    if [ -f $file ]; then
+        echo "# $file"
+        cat $file
+    else
+        echo >&2 "$0: $file does not exist"
+        exit 1
+    fi
+done
+
+exit 0
+
+
+    
+
+    
+        
diff --git a/tests/aux/touchfile b/tests/aux/touchfile
index b9d92a3..a3a2668 100755
--- a/tests/aux/touchfile
+++ b/tests/aux/touchfile
@@ -1,7 +1,7 @@
 #!/bin/sh
-dir=${1:?}
-time=${2:?}
-tag=${3:?}
+file=${1:?}
+time=${2:-0}
+tag=${3:-$file}
 
-touch $dir/$tag
-sleep $time
+echo $tag > $file
+test $time -ne 0 && sleep $time
diff --git a/tests/env.at b/tests/env.at
index 26fe866..c293c65 100644
--- a/tests/env.at
+++ b/tests/env.at
@@ -20,7 +20,10 @@ component envtest {
 }
 _EOT
 
-envtest -exec $abs_top_builddir/src/pies --foreground --stderr --config-file control.conf --config-file envtest.conf 2>errlog
+to 3 \
+  envtest -exec \
+    $abs_top_builddir/src/pies --foreground --stderr \
+                --config-file control.conf --config-file envtest.conf 2>errlog
 cat log
 ],
 [0],
@@ -63,3 +66,5 @@ PATH="/usr/local/bin:/usr/bin:/bin"
 PIES_INSTANCE="pies"
 USER="user"
 ])
+
+m4_popdef([ENVTEST])
diff --git a/tests/lines.c b/tests/lines.c
new file mode 100644
index 0000000..106491f
--- /dev/null
+++ b/tests/lines.c
@@ -0,0 +1,31 @@
+#include <stdio.h>
+
+int
+main (int argc, char **argv)
+{
+  char *progname = argv[0];
+  FILE *fp;
+  int c;
+  unsigned count;
+  
+  if (argc != 2)
+    {
+      fprintf (stderr, "usage: %s FILE\n", progname);
+      return 1;
+    }
+
+  fp = fopen (argv[1], "r");
+  if (!fp)
+    {
+      perror (argv[1]);
+      return 2;
+    }
+
+  count = 0;
+  while ((c = fgetc (fp)) != EOF)
+    if (c == '\n')
+      count++;
+  fclose (fp);
+  printf ("%u\n", count);
+  return 0;
+}
diff --git a/tests/redirect.at b/tests/redirect.at
index 7860736..12fb20f 100644
--- a/tests/redirect.at