Check accept components and inet built-in services.

* src/comp.c (component_verify,component_finish): Fix check for
the presense of the "command" statement.
* src/pies.c (component_keywords): Reorder some entries for
the consistency of config-help output.

* tests/.gitignore: Add new files.
* tests/Makefile.am: Add new tests and noinst programs.
* tests/accept.at: New test.
* tests/builtin.at: New test.
* tests/chargen.c: New file.
* tests/readtime.c: New file.
* tests/recvfd.c: Rewrite for testing both accept and pass-fd components.
* tests/passfd.at: Pass -s option to recvfd
* tests/testsuite.at: Add new tests.
* tests/lines.c: Minor changes.
* tests/nt.c: Minor changes.
* tests/to.c: Minor changes.

12 files changed, 526 insertions, 21 deletions

diff --git a/tests/.gitignore b/tests/.gitignore
index 7d2613a..43d3848 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -6,6 +6,8 @@ package.m4
 testsuite
 testsuite.dir
 testsuite.log
 to
 nt
 recvfd
+readtime
+chargen
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1fe78dc..4631a2c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -46,12 +46,14 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
 ## ------------ ##
 ## Test suite.  ##
 ## ------------ ##
 
 TESTSUITE_AT = \
  testsuite.at\
+ accept.at\
+ builtin.at\
  control.at\
  cyclic.at\
  env.at\
  envop.at\
  inet.at\
  maxinst.at\
@@ -65,23 +67,24 @@ TESTSUITE_AT = \
  shutdown.at\
  version.at
 
 TESTSUITE = $(srcdir)/testsuite
 M4=m4
 
-noinst_PROGRAMS = envtest to lines nt recvfd
+noinst_PROGRAMS = envtest to lines nt recvfd readtime chargen
 nt_SOURCES = nt.c iobuf.h
 AM_CPPFLAGS = \
  -I$(top_srcdir)/lib\
  -I$(top_srcdir)/gnu\
  -I$(top_builddir)/gnu\
  @GRECS_INCLUDES@
 
 LDADD = \
  ../lib/libpies.a\
- @GRECS_LDADD@
+ @GRECS_LDADD@\
+ ../gnu/libgnu.a
 
 AUTOTEST = $(AUTOM4TE) --language=autotest
 $(TESTSUITE): package.m4 $(TESTSUITE_AT)
         $(AM_V_GEN)$(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
         $(AM_V_at)mv $@.tmp $@
 
diff --git a/tests/accept.at b/tests/accept.at
new file mode 100644
index 0000000..f76a05a
--- /dev/null
+++ b/tests/accept.at
@@ -0,0 +1,54 @@
+# 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([accept component])
+AT_CHECK([
+PIES_XFAIL_CHECK
+PIES_CONTROL_INIT
+
+AT_DATA([input],
+[now is
+the time
+stop
+])
+
+: ${PIES_TEST_INET_SOCKET:=unix://$PWD/in.sock}
+
+cat > pies.conf <<_EOT
+component pfd {
+  command "recvfd $auxdir/in.test $PWD/inlog";
+  mode accept;
+  socket "$PIES_TEST_INET_SOCKET";
+  stderr file "$PWD/log.err";
+}
+component controller {
+  command "nt $PIES_TEST_INET_SOCKET -i input";
+}
+_EOT
+
+set -e
+to 10 \
+  pies --foreground --stderr \
+       --config-file control.conf --config-file pies.conf --debug 1 2>errlog
+
+cat inlog
+cat log.err >&2
+],
+[0],
+[now is
+the time
+stop
+])
+AT_CLEANUP
\ No newline at end of file
diff --git a/tests/builtin.at b/tests/builtin.at
new file mode 100644
index 0000000..40f65fa
--- /dev/null
+++ b/tests/builtin.at
@@ -0,0 +1,131 @@
+# This file is part of GNU pies testsuite. -*- Autotest -*-
+# Copyright (C) 2016-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_BANNER([inetd built-in services])
+
+# IT_BUILTIN([SERVICE],[INPUT],[OUTPUT])
+m4_define([IT_BUILTIN],
+[AT_SETUP([$1])
+AT_KEYWORDS([inetd builtin internal $1])
+AT_CHECK([
+PIES_XFAIL_CHECK
+PIES_CONTROL_INIT
+AT_DATA([input],
+[$2])
+m4_if([$1],[qotd],[AT_DATA([qotd],[$3])])
+: ${PIES_TEST_INET_SOCKET:=unix://$PWD/in.sock}
+cat > pies.conf <<_EOT
+m4_if([$1],[qotd],[qotd-file "$PWD/qotd";
+])
+component in {
+  mode inetd;
+  socket "$PIES_TEST_INET_SOCKET";
+  flags internal;
+  service $1;
+  stderr file "$PWD/log.err";
+}
+component controller {
+  command "nt $PIES_TEST_INET_SOCKET -i input -o output";
+  return-code * {
+    action disable;
+    exec "piesctl --url '$PIES_CTLSOCK' --no-netrc shutdown";
+  }     
+}
+_EOT
+set -e
+to 10 \
+  pies --foreground --stderr \
+       --config-file control.conf --config-file pies.conf --debug 1 2>errlog
+
+cat output m4_if([$1],[qotd],[| tr -d '\r'])
+cat log.err >&2
+],
+[0],
+[$3])
+AT_CLEANUP
+])
+
+# IT_SPECIAL(SERVICE,COMMAND)
+m4_define([IT_SPECIAL],
+[AT_SETUP([$1])
+AT_KEYWORDS([inetd builtin internal $1])
+AT_CHECK([
+PIES_XFAIL_CHECK
+PIES_CONTROL_INIT
+: ${PIES_TEST_INET_SOCKET:=unix://$PWD/in.sock}
+cat > pies.conf <<_EOT
+component in {
+  mode inetd;
+  socket "$PIES_TEST_INET_SOCKET";
+  flags internal;
+  service $1;
+  stderr file "$PWD/in.err";
+}
+component controller {
+  command "$2 '$PIES_TEST_INET_SOCKET'";
+  stderr file "$PWD/controller.err";
+  return-code * {
+    action disable;
+    exec "echo \$PIES_STATUS > $PWD/status ; piesctl --url '$PIES_CTLSOCK' --no-netrc shutdown";
+  }
+}
+_EOT
+set -e
+to 10 \
+  pies --foreground --stderr \
+       --config-file control.conf --config-file pies.conf --debug 1 2>errlog
+
+if test -s in.err; then
+  echo >&2 "in.err:"
+  cat controller.err >&2
+fi
+if test -s controller.err; then
+  echo >&2 "controller.err:"
+  cat controller.err >&2
+fi  
+exit `cat status`
+],
+[0])