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/shell.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/shell.at')
-rw-r--r-- | tests/shell.at | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/tests/shell.at b/tests/shell.at new file mode 100644 index 0000000..0ef2271 --- /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 | |||
17 | AT_SETUP([flags shell]) | ||
18 | |||
19 | AT_CHECK([ | ||
20 | PIES_XFAIL_CHECK | ||
21 | PIES_CONTROL_INIT | ||
22 | outfile=$PWD/respawn.out | ||
23 | cat > pies.conf <<_EOT | ||
24 | component test { | ||
25 | mode respawn; | ||
26 | flags shell; | ||
27 | command "$auxdir/respawn -tag respawn > $outfile"; | ||
28 | } | ||
29 | _EOT | ||
30 | |||
31 | pies --config-file control.conf --config-file pies.conf | ||
32 | |||
33 | n=0 | ||
34 | while : | ||
35 | do | ||
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 | ||
48 | done | ||
49 | |||
50 | PIES_STOP | ||
51 | head -n3 $outfile | ||
52 | ], | ||
53 | [0], | ||
54 | [respawn: start | ||
55 | respawn: stop | ||
56 | ]) | ||
57 | |||
58 | AT_CLEANUP | ||