aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2019-06-24 15:45:56 +0300
committerSergey Poznyakoff <gray@gnu.org>2019-06-24 15:45:56 +0300
commit985d3f42354b2c8e1525638d2187d875f465a69d (patch)
tree1355ed3c650e687aa436c1ca69e19989c9ee054b /tests
parent006bfbc5235c181783445d321ce7a7e3c6d8bd8a (diff)
downloadpies-985d3f42354b2c8e1525638d2187d875f465a69d.tar.gz
pies-985d3f42354b2c8e1525638d2187d875f465a69d.tar.bz2
Minor changes
* configure.ac: Minor changes * lib/libpies.h: Add missing include. * src/Makefile.am (pies_LDADD piesctl_LDADD): Add libintl libs * src/progman.c: Remove useless code. * tests/accept.at: Use canonical ordering of options and arguments. * tests/builtin.at: Likewise. * tests/inet.at: Likewise. * tests/maxinst.at: Likewise. * tests/passfd.at: Likewise. * tests/version.at: Don't expect GNU sed
Diffstat (limited to 'tests')
-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
@@ -31,13 +31,13 @@ component pfd {
31 command "recvfd $auxdir/in.test $PWD/inlog"; 31 command "recvfd $auxdir/in.test $PWD/inlog";
32 mode accept; 32 mode accept;
33 socket "$PIES_TEST_INET_SOCKET"; 33 socket "$PIES_TEST_INET_SOCKET";
34 stderr file "$PWD/log.err"; 34 stderr file "$PWD/log.err";
35} 35}
36component controller { 36component controller {
37 command "nt $PIES_TEST_INET_SOCKET -i input"; 37 command "nt -i input $PIES_TEST_INET_SOCKET";
38} 38}
39_EOT 39_EOT
40 40
41set -e 41set -e
42to 10 \ 42to 10 \
43 pies --foreground --stderr \ 43 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 {
34 socket "$PIES_TEST_INET_SOCKET"; 34 socket "$PIES_TEST_INET_SOCKET";
35 flags internal; 35 flags internal;
36 service $1; 36 service $1;
37 stderr file "$PWD/log.err"; 37 stderr file "$PWD/log.err";
38} 38}
39component controller { 39component controller {
40 command "nt $PIES_TEST_INET_SOCKET -i input -o output"; 40 command "nt -i input -o output $PIES_TEST_INET_SOCKET";
41 return-code * { 41 return-code * {
42 action disable; 42 action disable;
43 exec "piesctl --url '$PIES_CTLSOCK' --no-netrc shutdown"; 43 exec "piesctl --url '$PIES_CTLSOCK' --no-netrc shutdown";
44 } 44 }
45} 45}
46_EOT 46_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 {
28 command "$auxdir/in.test $PWD/inlog"; 28 command "$auxdir/in.test $PWD/inlog";
29 mode inetd; 29 mode inetd;
30 socket "$PIES_TEST_INET_SOCKET"; 30 socket "$PIES_TEST_INET_SOCKET";
31 stderr file "$PWD/log.err"; 31 stderr file "$PWD/log.err";
32} 32}
33component controller { 33component controller {
34 command "nt $PIES_TEST_INET_SOCKET -i input"; 34 command "nt -i input $PIES_TEST_INET_SOCKET";
35} 35}
36_EOT 36_EOT
37set -e 37set -e
38to 10 \ 38to 10 \
39 pies --foreground --stderr \ 39 pies --foreground --stderr \
40 --config-file control.conf --config-file pies.conf --debug 1 2>errlog 40 --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
34]) 34])
35 35
36: ${PIES_TEST_INET_SOCKET:=unix://$PWD/in.sock} 36: ${PIES_TEST_INET_SOCKET:=unix://$PWD/in.sock}
37 37
38cat > pies.conf <<_EOT 38cat > pies.conf <<_EOT
39component in { 39component in {
40 command "$auxdir/in.test /tmp/in.log"; 40 command "$auxdir/in.test $PWD/in.log";
41 mode inetd; 41 mode inetd;
42 socket "$PIES_TEST_INET_SOCKET"; 42 socket "$PIES_TEST_INET_SOCKET";
43 stderr file "$PWD/in.err"; 43 stderr file "$PWD/in.err";
44 max-instances 2; 44 max-instances 2;
45 max-instances-message "too many instances running\n"; 45 max-instances-message "too many instances running\n";
46} 46}
47component con1 { 47component con1 {
48 command "nt $PIES_TEST_INET_SOCKET -i in1 -o con1.out"; 48 command "nt -i in1 -o con1.out $PIES_TEST_INET_SOCKET";
49 stderr file "/tmp/con1.err"; 49 stderr file "/tmp/con1.err";
50} 50}
51component con2 { 51component con2 {
52 command "nt $PIES_TEST_INET_SOCKET -i in2 -o con2.out"; 52 command "nt -i in2 -o con2.out $PIES_TEST_INET_SOCKET";
53 stderr file "/tmp/con2.err"; 53 stderr file "/tmp/con2.err";
54 flags (disable); 54 flags (disable);
55} 55}
56component con3 { 56component con3 {
57 flags (disable); 57 flags (disable);
58 command "nt $PIES_TEST_INET_SOCKET -o con3.out"; 58 command "nt -o con3.out $PIES_TEST_INET_SOCKET";
59 stderr file "/tmp/con3.err"; 59 stderr file "/tmp/con3.err";
60 return-code * { 60 return-code * {
61 action disable; 61 action disable;
62 exec "$abs_top_builddir/src/piesctl --url unix://$PWD/pies.ctl --no-netrc shutdown"; 62 exec "$abs_top_builddir/src/piesctl --url unix://$PWD/pies.ctl --no-netrc shutdown";
63 } 63 }
64} 64}
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 {
34 pass-fd-timeout 3; 34 pass-fd-timeout 3;
35 pass-fd-socket "$PIES_FD_SOCKET"; 35 pass-fd-socket "$PIES_FD_SOCKET";
36 socket "$PIES_TEST_INET_SOCKET"; 36 socket "$PIES_TEST_INET_SOCKET";
37 stderr file "$PWD/log.err"; 37 stderr file "$PWD/log.err";
38} 38}
39component controller { 39component controller {
40 command "nt $PIES_TEST_INET_SOCKET -i input"; 40 command "nt -i input $PIES_TEST_INET_SOCKET";
41} 41}
42_EOT 42_EOT
43 43
44set -e 44set -e
45to 10 \ 45to 10 \
46 pies --foreground --stderr \ 46 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 @@
13# 13#
14# You should have received a copy of the GNU General Public License 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/>. 15# along with GNU pies. If not, see <http://www.gnu.org/licenses/>.
16 16
17AT_SETUP([GNU pies version]) 17AT_SETUP([GNU pies version])
18 18
19AT_CHECK([pies --version | sed '1{s/ *[\[.*\]]//;q}' ], 19AT_CHECK([pies --version | sed -n '1{s/ *[\[.*\]]//;p;}' ],
20 [0], 20 [0],
21 [pies (AT_PACKAGE_NAME) AT_PACKAGE_VERSION 21 [pies (AT_PACKAGE_NAME) AT_PACKAGE_VERSION
22], 22],
23[], 23[],
24[PIES_XFAIL_MSG([WARNING: Not using the proper version, *all* checks dubious...]) 24[PIES_XFAIL_MSG([WARNING: Not using the proper version, *all* checks dubious...])
25], 25],

Return to:

Send suggestions and report system problems to the System administrator.