summaryrefslogtreecommitdiffabout
path: root/tests
Side-by-side diff
Diffstat (limited to 'tests') (more/less context) (ignore whitespace changes)
-rw-r--r--tests/accept.at2
-rw-r--r--tests/builtin.at2
-rw-r--r--tests/inet.at2
-rw-r--r--tests/maxinst.at8
-rw-r--r--tests/passfd.at2
-rw-r--r--tests/version.at2
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
@@ -34,7 +34,7 @@ component pfd {
stderr file "$PWD/log.err";
}
component controller {
- command "nt $PIES_TEST_INET_SOCKET -i input";
+ command "nt -i input $PIES_TEST_INET_SOCKET";
}
_EOT
diff --git a/tests/builtin.at b/tests/builtin.at
index 893f213..80f060c 100644
--- a/tests/builtin.at
+++ b/tests/builtin.at
@@ -37,7 +37,7 @@ component in {
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";
diff --git a/tests/inet.at b/tests/inet.at
index 893e45f..7d1d99f 100644
--- a/tests/inet.at
+++ b/tests/inet.at
@@ -31,7 +31,7 @@ component in {
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
diff --git a/tests/maxinst.at b/tests/maxinst.at
index f67d15e..c3b642b 100644
--- a/tests/maxinst.at
+++ b/tests/maxinst.at
@@ -37,7 +37,7 @@ quit
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";
@@ -45,17 +45,17 @@ component in {
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;
diff --git a/tests/passfd.at b/tests/passfd.at
index 8a7eecb..11fbece 100644
--- a/tests/passfd.at
+++ b/tests/passfd.at
@@ -37,7 +37,7 @@ component pfd {
stderr file "$PWD/log.err";
}
component controller {
- command "nt $PIES_TEST_INET_SOCKET -i input";
+ command "nt -i input $PIES_TEST_INET_SOCKET";
}
_EOT
diff --git a/tests/version.at b/tests/version.at
index 4d71ee1..bbf0144 100644
--- a/tests/version.at
+++ b/tests/version.at
@@ -16,7 +16,7 @@
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
],

Return to:

Send suggestions and report system problems to the System administrator.