35 files changed, 466 insertions, 84 deletions

diff --git a/tests/.gitignore b/tests/.gitignore
index 43d3848..1993da2 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -11,3 +11,4 @@ nt
 recvfd
 readtime
 chargen
+sigwait
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bfdc692..6724aea 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 # This file is part of GNU Pies.
-# Copyright (C) 2008-2020 Sergey Poznyakoff
+# Copyright (C) 2008-2023 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
@@ -54,7 +54,9 @@ TESTSUITE_AT = \
  control.at\
  cyclic.at\
  env.at\
+ envglobal.at\
  envop.at\
+ expandenv.at\
  inet.at\
  maxinst.at\
  passfd.at\
@@ -62,15 +64,17 @@ TESTSUITE_AT = \
  redirect.at\
  ret-exec.at\
  ret-notify.at\
+ sigterm.at\
  shell.at\
  startup.at\
+ shdnseq.at\
  shutdown.at\
  version.at
 
 TESTSUITE = $(srcdir)/testsuite
 M4=m4
 
-noinst_PROGRAMS = envtest to lines nt recvfd readtime chargen
+noinst_PROGRAMS = envtest to lines nt recvfd readtime chargen sigwait
 nt_SOURCES = nt.c iobuf.h
 AM_CPPFLAGS = \
  -I$(top_srcdir)/lib\
diff --git a/tests/accept.at b/tests/accept.at
index e12be02..0249ad6 100644
--- a/tests/accept.at
+++ b/tests/accept.at
@@ -1,5 +1,5 @@
-# This file is part of GNU pies testsuite. -*- Autotest -*-
-# Copyright (C) 2019-2020 Sergey Poznyakoff
+# This file is part of GNU pies testsuite. -*- autotest -*-
+# Copyright (C) 2019-2023 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
@@ -40,7 +40,7 @@ _EOT
 
 set -e
 to 10 \
-  pies --foreground --stderr \
+  pies --no-preprocessor --foreground --stderr \
        --config-file control.conf --config-file pies.conf --debug 1 2>errlog
 
 cat inlog
@@ -51,4 +51,4 @@ cat log.err >&2
 the time
 stop
 ])
-AT_CLEANUP
\ No newline at end of file
+AT_CLEANUP
diff --git a/tests/atlocal.in b/tests/atlocal.in
index c043843..0e4695e 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,6 +1,6 @@
 # @configure_input@                                     -*- shell-script -*-
 # Configurable variable values for GNU Pies test suite.
-# Copyright (C) 2016-2020 Sergey Poznyakoff
+# Copyright (C) 2016-2023 Sergey Poznyakoff
 
 PATH=@abs_builddir@:@abs_top_builddir@/src:$srcdir:$PATH
 XFAILFILE=$abs_builddir/.badversion
diff --git a/tests/aux/in.test b/tests/aux/in.test
index 1fae034..54b546a 100755
--- a/tests/aux/in.test
+++ b/tests/aux/in.test
@@ -4,7 +4,7 @@ FILE=${1:?}
 IFS='   

 '
 : ${PIESCTL:=piesctl}
-PIESCTL="$PIESCTL --no-netrc${PIES_CTLSOCK:+ --url=}$PIES_CTLSOCK"
+PIESCTL="$PIESCTL --config-file=/dev/null --no-netrc${PIES_CTLSOCK:+ --url=}$PIES_CTLSOCK"
 while read COMMAND ARG
 do
     echo $COMMAND $ARG >> $FILE
diff --git a/tests/builtin.at b/tests/builtin.at
index 88e24d7..c13b42b 100644
--- a/tests/builtin.at
+++ b/tests/builtin.at
@@ -1,5 +1,5 @@
-# This file is part of GNU pies testsuite. -*- Autotest -*-
-# Copyright (C) 2016-2020 Sergey Poznyakoff
+# This file is part of GNU pies testsuite. -*- autotest -*-
+# Copyright (C) 2016-2023 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
@@ -40,13 +40,13 @@ component controller {
   command "nt -i input -o output $PIES_TEST_INET_SOCKET";
   return-code * {
     action disable;
-    exec "piesctl --url '$PIES_CTLSOCK' --no-netrc shutdown";
+    exec "piesctl --config-file=/dev/null --url '$PIES_CTLSOCK' --config-file=/dev/null --no-netrc shutdown";
   }     
 }
 _EOT
 set -e
 to 10 \
-  pies --foreground --stderr \
+  pies --no-preprocessor --foreground --stderr \
        --config-file control.conf --config-file pies.conf --debug 1 2>errlog
 
 cat output m4_if([$1],[qotd],[| tr -d '\r'])
@@ -78,7 +78,7 @@ component controller {
   stderr file "$PWD/controller.err";
   return-code * {
     action disable;
-    exec "echo \$PIES_STATUS > $PWD/status ; piesctl --url '$PIES_CTLSOCK' --no-netrc shutdown";
+    exec "echo \$PIES_STATUS > $PWD/status ; piesctl --url '$PIES_CTLSOCK' --config-file=/dev/null --no-netrc shutdown";
   }
 }
 _EOT
@@ -86,7 +86,7 @@ TZ=0
 export TZ
 set -e
 to 10 \
-  pies --foreground --stderr \
+  pies --no-preprocessor --foreground --stderr \
        --config-file control.conf --config-file pies.conf --debug 1 2>errlog
 
 if test -s in.err; then
@@ -166,14 +166,14 @@ component test {
   stderr file "$PWD/test.err";
   return-code * {
       action disable;
-      exec "piesctl --no-netrc --url=$PIES_CTLSOCK shutdown";
+      exec "piesctl --config-file=/dev/null --no-netrc --url=$PIES_CTLSOCK shutdown";
   }
 }
 _EOT
 
 set -e
 to 10 \
-  pies --foreground --stderr \
+  pies --no-preprocessor --foreground --stderr \
        --config-file control.conf --config-file pies.conf --debug 1 2>errlog
 
 for err in one.err two.err test.err
diff --git a/tests/chargen.c b/tests/chargen.c
index 59aa0d8..5f5a170 100644
--- a/tests/chargen.c
+++ b/tests/chargen.c
@@ -1,5 +1,5 @@
 /* This file is part of GNU Pies testsuite.
-   Copyright (C) 2019-2020 Sergey Poznyakoff
+   Copyright (C) 2019-2023 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
diff --git a/tests/control.at b/tests/control.at
index 5171862..6027817 100644
--- a/tests/control.at
+++ b/tests/control.at
@@ -1,5 +1,5 @@