12 files changed, 108 insertions, 9 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 447104b..b2f2719 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -14,7 +14,13 @@
 # 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
+AUXTOOLS = \
+ aux/respawn\
+ aux/retcode\
+ aux/mailer\
+ aux/startup
+
+EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4 $(AUXTOOLS)
 DISTCLEANFILES       = atconfig $(check_SCRIPTS)
 MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
 
@@ -46,6 +52,7 @@ TESTSUITE_AT = \
  redirect.at\
  ret-exec.at\
  ret-notify.at\
+ startup.at\
  version.at
 
 TESTSUITE = $(srcdir)/testsuite
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 9069bbd..1992b80 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -4,7 +4,7 @@
 
 PATH=@abs_builddir@:@abs_top_builddir@/src:$srcdir:$PATH
 XFAILFILE=$abs_builddir/.badversion
-
+auxdir="$abs_srcdir/aux"
 trimws() {
     sed 's/[    ][      ]*$//'
 }
diff --git a/tests/mailer b/tests/aux/mailer
index f832ff5..f832ff5 100755
--- a/tests/mailer
+++ b/tests/aux/mailer
diff --git a/tests/respawn b/tests/aux/respawn
index 11d59f6..11d59f6 100755
--- a/tests/respawn
+++ b/tests/aux/respawn
diff --git a/tests/retcode b/tests/aux/retcode
index b827ba9..b827ba9 100755
--- a/tests/retcode
+++ b/tests/aux/retcode
diff --git a/tests/aux/startup b/tests/aux/startup
new file mode 100755
index 0000000..b9d92a3
--- /dev/null
+++ b/tests/aux/startup
@@ -0,0 +1,7 @@
+#!/bin/sh
+dir=${1:?}
+time=${2:?}
+tag=${3:?}
+
+touch $dir/$tag
+sleep $time
diff --git a/tests/redirect.at b/tests/redirect.at
index 9e53ba2..3a8cca7 100644
--- a/tests/redirect.at
+++ b/tests/redirect.at
@@ -24,7 +24,7 @@ outfile=$PWD/out
 cat > pies.conf <<_EOT
 component test {
         mode respawn;
-        command "$abs_srcdir/respawn -tag respawn -append -pid $comp_pid_file";
+        command "$auxdir/respawn -tag respawn -append -pid $comp_pid_file";
         stdout file "$outfile";
 }
 _EOT
diff --git a/tests/respawn.at b/tests/respawn.at
index 8d72c40..4a8e3a7 100644
--- a/tests/respawn.at
+++ b/tests/respawn.at
@@ -23,7 +23,7 @@ comp_pid_file=$PWD/comp.pid
 cat > pies.conf <<_EOT
 component test {
         mode respawn;
-        command "$abs_srcdir/respawn -append -pid $comp_pid_file";
+        command "$auxdir/respawn -append -pid $comp_pid_file";
 }
 _EOT
 
diff --git a/tests/ret-exec.at b/tests/ret-exec.at
index bf2c1a4..0b3d716 100644
--- a/tests/ret-exec.at
+++ b/tests/ret-exec.at
@@ -26,10 +26,10 @@ cat > pies.conf <<_EOT
 component test {
         mode respawn;
         return-code 10 {
-                exec "$abs_srcdir/retcode $report_file";
+                exec "$auxdir/retcode $report_file";
                 action disable;
         }
-        command "$abs_srcdir/respawn -sleep 2 -pid $comp_pid_file -exit 10";
+        command "$auxdir/respawn -sleep 2 -pid $comp_pid_file -exit 10";
 }
 _EOT
 
diff --git a/tests/ret-notify.at b/tests/ret-notify.at
index d1a7f39..a7768aa 100644
--- a/tests/ret-notify.at
+++ b/tests/ret-notify.at
@@ -22,15 +22,15 @@ PIES_XFAIL_CHECK
 PIES_CONTROL_INIT
 report_file=$PWD/report
 cat > pies.conf <<_EOT
-mailer-program "$abs_srcdir/mailer";
-mailer-command-line "$abs_srcdir/mailer $report_file";
+mailer-program "$auxdir/mailer";
+mailer-command-line "$auxdir/mailer $report_file";
 component test {
         mode respawn;
         return-code 10 {
                 notify root;
                 action disable;
         }
-        command "$abs_srcdir/respawn -sleep 2 -exit 10";
+        command "$auxdir/respawn -sleep 2 -exit 10";
 }
 _EOT
 
diff --git a/tests/startup.at b/tests/startup.at
new file mode 100644
index 0000000..72017ce
--- /dev/null
+++ b/tests/startup.at
@@ -0,0 +1,84 @@
+# This file is part of GNU pies testsuite. -*- Autotest -*-
+# Copyright (C) 2019 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([Startup components])
+
+AT_CHECK([
+PIES_XFAIL_CHECK
+PIES_CONTROL_INIT
+comp_pid_file=$PWD/comp.pid
+
+cat > pies.conf <<_EOT
+component b1 {
+        mode startup;
+        command "$auxdir/startup $PWD 1 b1";
+}
+
+component b2 {
+        mode startup;
+        command "$auxdir/startup $PWD 2 b2";
+}
+
+component test {
+        mode respawn;
+        command "$auxdir/respawn -append -pid $comp_pid_file";
+}
+_EOT
+
+pies --config-file control.conf --config-file pies.conf
+
+n=0
+res=
+b1=
+b2=
+while :
+do
+    echo "n=$n" >> tracefile
+    if test -z "$b1" && test -f b1; then
+        res="${res}b1"
+        b1=1
+        echo "got b1" >> tracefile
+    fi
+    if test -z "$b2"  && test -f b2; then
+        res="${res}b2"
+        b2=1
+        echo "got b2" >> tracefile
+    fi
+    if test -f $comp_pid_file; then
+        echo "got pidfile" >> tracefile
+        res="${res}pid"
+        break
+    fi
+    sleep 1
+    n=$(($n + 1))
+    if test $n -gt 10; then
+        echo >&2 "timed out"
+        break
+    fi
+done
+
+PIES_STOP
+case $res in
+b1b2pid|b2b1pid) echo b1b2pid;;
+*)               echo $res
+esac
+],
+[0],
+[b1b2pid
+])
+
+AT_CLEANUP
+
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 03ddd50..2a1167d 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -65,3 +65,4 @@ m4_include([respawn.at])
 m4_include([redirect.at])
 m4_include([ret-exec.at])
 m4_include([ret-notify.at])
+m4_include([startup.at])