diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2019-05-31 08:45:23 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2019-05-31 08:58:54 +0300 |
commit | 058f256a6f41fc9c36404b2e22580546e4f55b33 (patch) | |
tree | b6afde4271da1d92e5c10e1c50213c2fda7b2831 /tests/respawn.at | |
parent | ca38eef07ac3f9a4825f0046c1d373ed7b2f074b (diff) | |
download | pies-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/respawn.at')
-rw-r--r-- | tests/respawn.at | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/respawn.at b/tests/respawn.at index 4a8e3a7..6b51ca6 100644 --- a/tests/respawn.at +++ b/tests/respawn.at | |||
@@ -31,13 +31,13 @@ pies --config-file control.conf --config-file pies.conf | |||
31 | 31 | ||
32 | n=0 | 32 | n=0 |
33 | while : | 33 | while : |
34 | do | 34 | do |
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 |
41 | sleep 1 | 41 | sleep 1 |
42 | n=$(($n + 1)) | 42 | n=$(($n + 1)) |
43 | if test $n -gt 35; then | 43 | if test $n -gt 35; then |