summaryrefslogtreecommitdiffabout
path: root/tests
authorSergey Poznyakoff <gray@gnu.org>2019-05-31 05:45:23 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2019-05-31 05:58:54 (GMT)
commit058f256a6f41fc9c36404b2e22580546e4f55b33 (patch) (unidiff)
treeb6afde4271da1d92e5c10e1c50213c2fda7b2831 /tests
parentca38eef07ac3f9a4825f0046c1d373ed7b2f074b (diff)
downloadpies-058f256a6f41fc9c36404b2e22580546e4f55b33.tar.gz
pies-058f256a6f41fc9c36404b2e22580546e4f55b33.tar.bz2
Provide an option to run commands via sh -c
The new flag "shell" instructs pies to run the command marked with it as '/bin/sh -c $command'. Alternative shell can be supplied ising the 'program' statement. This is useful if the command line uses shell-specific features (command or variable expansion, redirection, pipes, etc.) This commit also fixes a bug in the 'env' statement handling: a single argument with embedded whitespaces was undergoing word splitting and thus incorrectly handled as multiple arguments. * NEWS: Document changes. * doc/pies.texi: Likewise. * src/comp.c (component_free): Free command. (component_finish): Split command into argv/argc as directed by the CF_SHELL flag. * src/pies.c (_cb_command): Remove. Functionality moved to component_finish(). (_cb_env): Bugfix. Don't split arguments. * src/pies.h (CF_SHELL): New flag. (component) <command>: New member. * tests/Makefile.am: Add new tests. * tests/testsuite.at: Add new tests. * tests/aux/respawn: Change default timeout to 1 second. * tests/respawn.at: Minor change. * tests/shell.at: New test.
Diffstat (limited to 'tests') (more/less context) (ignore whitespace changes)
-rw-r--r--tests/Makefile.am1
-rwxr-xr-xtests/aux/respawn2
-rw-r--r--tests/respawn.at2
-rw-r--r--tests/shell.at58
-rw-r--r--tests/testsuite.at1
5 files changed, 62 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b404ed4..39899c8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -52,6 +52,7 @@ TESTSUITE_AT = \
52 redirect.at\ 52 redirect.at\
53 ret-exec.at\ 53 ret-exec.at\
54 ret-notify.at\ 54 ret-notify.at\
55 shell.at\
55 startup.at\ 56 startup.at\
56 shutdown.at\ 57 shutdown.at\
57 version.at 58 version.at
diff --git a/tests/aux/respawn b/tests/aux/respawn
index 11d59f6..cd9687a 100755
--- a/tests/aux/respawn
+++ b/tests/aux/respawn
@@ -5,7 +5,7 @@
5 5
6append=0 6append=0
7unset name 7unset name
8time=10 8time=1
9tag=$0 9tag=$0
10code=0 10code=0
11 11
diff --git a/tests/respawn.at b/tests/respawn.at
index 4a8e3a7..6b51ca6 100644
--- a/tests/respawn.at
+++ b/tests/respawn.at
@@ -34,7 +34,7 @@ while :
34do 34do
35 if test -f $comp_pid_file; then 35 if test -f $comp_pid_file; then
36 lines=`wc -l $comp_pid_file | awk '{print $1}'` 36 lines=`wc -l $comp_pid_file | awk '{print $1}'`
37 if test "$lines" -ge 3 ; then 37 if test "$lines" -ge 2 ; then
38 break 38 break
39 fi 39 fi
40 fi 40 fi
diff --git a/tests/shell.at b/tests/shell.at
new file mode 100644
index 0000000..0ef2271
--- a/dev/null
+++ b/tests/shell.at
@@ -0,0 +1,58 @@
1# This file is part of GNU pies testsuite. -*- Autotest -*-
2# Copyright (C) 2016-2019 Sergey Poznyakoff
3#
4# GNU pies is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option)
7# any later version.
8#
9# GNU pies is distributed in the hope that it will be useful,
10# but WITHOUT ANY WARRANTY; without even the implied warranty of
11# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12# GNU General Public License for more details.
13#
14# You should have received a copy of the GNU General Public License
15# along with GNU pies. If not, see <http://www.gnu.org/licenses/>.
16
17AT_SETUP([flags shell])
18
19AT_CHECK([
20PIES_XFAIL_CHECK
21PIES_CONTROL_INIT
22outfile=$PWD/respawn.out
23cat > pies.conf <<_EOT
24component test {
25 mode respawn;
26 flags shell;
27 command "$auxdir/respawn -tag respawn > $outfile";
28}
29_EOT
30
31pies --config-file control.conf --config-file pies.conf
32
33n=0
34while :
35do
36 if test -f $outfile; then
37 lines=`wc -l $outfile | awk '{print $1}'`
38 if test "$lines" -ge 2 ; then
39 break
40 fi
41 fi
42 sleep 1
43 n=$(($n + 1))
44 if test $n -gt 35; then
45 echo >&2 "timed out"
46 break
47 fi
48done
49
50PIES_STOP
51head -n3 $outfile
52],
53[0],
54[respawn: start
55respawn: stop
56])
57
58AT_CLEANUP
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 6775ee7..28d1f9d 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -67,3 +67,4 @@ m4_include([ret-exec.at])
67m4_include([ret-notify.at]) 67m4_include([ret-notify.at])
68m4_include([startup.at]) 68m4_include([startup.at])
69m4_include([shutdown.at]) 69m4_include([shutdown.at])
70m4_include([shell.at])

Return to:

Send suggestions and report system problems to the System administrator.