summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2019-06-24 12:45:56 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2019-06-24 12:45:56 (GMT)
commit985d3f42354b2c8e1525638d2187d875f465a69d (patch) (side-by-side diff)
tree1355ed3c650e687aa436c1ca69e19989c9ee054b
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 (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac2
-rw-r--r--lib/libpies.h1
-rw-r--r--src/Makefile.am6
-rw-r--r--src/progman.c5
-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
10 files changed, 17 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac
index 3a23a1a..149657d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,6 +173,7 @@ AM_MISSING_PROG([AUTOM4TE], [autom4te])
AC_CONFIG_COMMANDS([status],[
cat <<EOF
+
Configuration summary:
URL of the control API ............................. $control_url
@@ -185,6 +186,7 @@ URL of the SystemV init ............................ $sysvinit_control_url
Emergency shell .................................... $emergency_shell
EOF
fi
+echo
],
[sysvinit_status=$sysvinit_status
control_url=`echo "$DEFAULT_PIES_CONTROL_URL" | sed 's/\\\$/\\\\\$/g'`
diff --git a/lib/libpies.h b/lib/libpies.h
index 40364a6..9086712 100644
--- a/lib/libpies.h
+++ b/lib/libpies.h
@@ -20,6 +20,7 @@
#include <gettext.h>
#include <netinet/in.h>
#include <sys/un.h>
+#include <sys/socket.h>
#include <grecs.h>
#if defined HAVE_SYSCONF && defined _SC_OPEN_MAX
diff --git a/src/Makefile.am b/src/Makefile.am
index 925da88..d30eab8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -68,14 +68,16 @@ pies_LDADD = \
@GRECS_LDADD@\
../gnu/libgnu.a\
$(MF_PROCTITLE_LIBS)\
- @PAM_LIBS@
+ @PAM_LIBS@\
+ $(LTLIBINTL) $(LTLIBICONV)
piesctl_SOURCES = piesctl.c
piesctl_LDADD = \
../lib/libpies.a\
@GRECS_LDADD@\
- ../gnu/libgnu.a
+ ../gnu/libgnu.a\
+ $(LTLIBINTL) $(LTLIBICONV)
pkgstatedir=$(localstatedir)/pies
diff --git a/src/progman.c b/src/progman.c
index 70ebf68..e255c33 100644
--- a/src/progman.c
+++ b/src/progman.c
@@ -1501,10 +1501,7 @@ prog_start_prerequisites (struct prog *prog)
}
if (!prog->active)
- {
- prog->active = 0;
- return 1;
- }
+ return 1;
p = comp->prog;
switch (p->v.p.status)
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.