diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/accept.at | 2 | ||||
| -rw-r--r-- | tests/builtin.at | 2 | ||||
| -rw-r--r-- | tests/inet.at | 2 | ||||
| -rw-r--r-- | tests/maxinst.at | 8 | ||||
| -rw-r--r-- | tests/passfd.at | 2 | ||||
| -rw-r--r-- | tests/version.at | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/tests/accept.at b/tests/accept.at index f76a05a..f222d6a 100644 --- a/tests/accept.at +++ b/tests/accept.at @@ -31,13 +31,13 @@ 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"; + command "nt -i input $PIES_TEST_INET_SOCKET"; } _EOT set -e to 10 \ pies --foreground --stderr \ diff --git a/tests/builtin.at b/tests/builtin.at index 893f213..80f060c 100644 --- a/tests/builtin.at +++ b/tests/builtin.at @@ -34,13 +34,13 @@ component in { 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"; + command "nt -i input -o output $PIES_TEST_INET_SOCKET"; return-code * { action disable; exec "piesctl --url '$PIES_CTLSOCK' --no-netrc shutdown"; } } _EOT diff --git a/tests/inet.at b/tests/inet.at index 893e45f..7d1d99f 100644 --- a/tests/inet.at +++ b/tests/inet.at @@ -28,13 +28,13 @@ component in { command "$auxdir/in.test $PWD/inlog"; mode inetd; socket "$PIES_TEST_INET_SOCKET"; stderr file "$PWD/log.err"; } component controller { - command "nt $PIES_TEST_INET_SOCKET -i input"; + command "nt -i input $PIES_TEST_INET_SOCKET"; } _EOT set -e to 10 \ pies --foreground --stderr \ --config-file control.conf --config-file pies.conf --debug 1 2>errlog diff --git a/tests/maxinst.at b/tests/maxinst.at index f67d15e..c3b642b 100644 --- a/tests/maxinst.at +++ b/tests/maxinst.at @@ -34,31 +34,31 @@ quit ]) : ${PIES_TEST_INET_SOCKET:=unix://$PWD/in.sock} cat > pies.conf <<_EOT component in { - command "$auxdir/in.test /tmp/in.log"; + command "$auxdir/in.test $PWD/in.log"; mode inetd; socket "$PIES_TEST_INET_SOCKET"; stderr file "$PWD/in.err"; max-instances 2; max-instances-message "too many instances running\n"; } component con1 { - command "nt $PIES_TEST_INET_SOCKET -i in1 -o con1.out"; + command "nt -i in1 -o con1.out $PIES_TEST_INET_SOCKET"; stderr file "/tmp/con1.err"; } component con2 { - command "nt $PIES_TEST_INET_SOCKET -i in2 -o con2.out"; + command "nt -i in2 -o con2.out $PIES_TEST_INET_SOCKET"; stderr file "/tmp/con2.err"; flags (disable); } component con3 { flags (disable); - command "nt $PIES_TEST_INET_SOCKET -o con3.out"; + command "nt -o con3.out $PIES_TEST_INET_SOCKET"; stderr file "/tmp/con3.err"; return-code * { action disable; exec "$abs_top_builddir/src/piesctl --url unix://$PWD/pies.ctl --no-netrc shutdown"; } } diff --git a/tests/passfd.at b/tests/passfd.at index 8a7eecb..11fbece 100644 --- a/tests/passfd.at +++ b/tests/passfd.at @@ -34,13 +34,13 @@ component pfd { pass-fd-timeout 3; pass-fd-socket "$PIES_FD_SOCKET"; socket "$PIES_TEST_INET_SOCKET"; stderr file "$PWD/log.err"; } component controller { - command "nt $PIES_TEST_INET_SOCKET -i input"; + command "nt -i input $PIES_TEST_INET_SOCKET"; } _EOT set -e to 10 \ pies --foreground --stderr \ diff --git a/tests/version.at b/tests/version.at index 4d71ee1..bbf0144 100644 --- a/tests/version.at +++ b/tests/version.at @@ -13,13 +13,13 @@ # # 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([GNU pies version]) -AT_CHECK([pies --version | sed '1{s/ *[\[.*\]]//;q}' ], +AT_CHECK([pies --version | sed -n '1{s/ *[\[.*\]]//;p;}' ], [0], [pies (AT_PACKAGE_NAME) AT_PACKAGE_VERSION ], [], [PIES_XFAIL_MSG([WARNING: Not using the proper version, *all* checks dubious...]) ], |