Send inn-committers mailing list submissions to
inn-committers@lists.isc.org
To subscribe or unsubscribe via the World Wide Web, visit
https://lists.isc.org/mailman/listinfo/inn-committers
or, via email, send a message with subject or body 'help' to
inn-committers-requ...@lists.isc.org
You can reach the person managing the list at
inn-committers-ow...@lists.isc.org
When replying, please edit your Subject line so it is more specific
than "Re: Contents of inn-committers digest..."
Today's Topics:
1. INN commit: trunk/doc/pod (newsfeeds.pod ovdb.pod) (INN Commit)
2. INN commit: branches/2.5/doc/pod (newsfeeds.pod ovdb.pod)
(INN Commit)
3. INN commit: trunk (6 files) (INN Commit)
4. INN commit: branches/2.5 (6 files) (INN Commit)
----------------------------------------------------------------------
Message: 1
Date: Wed, 16 Jan 2013 11:29:13 -0800 (PST)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk/doc/pod (newsfeeds.pod ovdb.pod)
Message-ID: <20130116192913.0406767...@hope.eyrie.org>
Date: Wednesday, January 16, 2013 @ 11:29:12
Author: iulius
Revision: 9455
Typos.
Thanks to Florian Schlichting for the report.
Modified:
trunk/doc/pod/newsfeeds.pod
trunk/doc/pod/ovdb.pod
---------------+
newsfeeds.pod | 2 +-
ovdb.pod | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Modified: newsfeeds.pod
===================================================================
--- newsfeeds.pod 2012-12-30 18:01:39 UTC (rev 9454)
+++ newsfeeds.pod 2013-01-16 19:29:12 UTC (rev 9455)
@@ -638,7 +638,7 @@
nntpsend(8).
A program feed (B<Tp>) spawns a given program for every article that the
-site receives. The I<paramter> field must be the command line to execute,
+site receives. The I<parameter> field must be the command line to execute,
and should contain one instance of C<%s>, which will be replaced by the
storage API token of the article (the actual article can be retrieved by
the program using sm(8)). The program will not receive anything on
Modified: ovdb.pod
===================================================================
--- ovdb.pod 2012-12-30 18:01:39 UTC (rev 9454)
+++ ovdb.pod 2013-01-16 19:29:12 UTC (rev 9455)
@@ -50,7 +50,7 @@
To enable ovdb, set the I<ovmethod> parameter in F<inn.conf> to C<ovdb>.
The ovdb database is stored in the directory specified by the
-I<pathoverview> paramter in F<inn.conf>. This is the "DB_HOME" directory.
+I<pathoverview> parameter in F<inn.conf>. This is the "DB_HOME" directory.
To start out, this directory should be empty (other than an optional
F<DB_CONFIG> file; see L<DB_CONFIG> for details) and B<innd> (or
B<makehistory>) will create the files as necessary in that directory.
------------------------------
Message: 2
Date: Wed, 16 Jan 2013 11:29:51 -0800 (PST)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: branches/2.5/doc/pod (newsfeeds.pod ovdb.pod)
Message-ID: <20130116192951.e06a867...@hope.eyrie.org>
Date: Wednesday, January 16, 2013 @ 11:29:51
Author: iulius
Revision: 9456
Typos.
Thanks to Florian Schlichting for the report.
Modified:
branches/2.5/doc/pod/newsfeeds.pod
branches/2.5/doc/pod/ovdb.pod
---------------+
newsfeeds.pod | 2 +-
ovdb.pod | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Modified: newsfeeds.pod
===================================================================
--- newsfeeds.pod 2013-01-16 19:29:12 UTC (rev 9455)
+++ newsfeeds.pod 2013-01-16 19:29:51 UTC (rev 9456)
@@ -638,7 +638,7 @@
nntpsend(8).
A program feed (B<Tp>) spawns a given program for every article that the
-site receives. The I<paramter> field must be the command line to execute,
+site receives. The I<parameter> field must be the command line to execute,
and should contain one instance of C<%s>, which will be replaced by the
storage API token of the article (the actual article can be retrieved by
the program using sm(8)). The program will not receive anything on
Modified: ovdb.pod
===================================================================
--- ovdb.pod 2013-01-16 19:29:12 UTC (rev 9455)
+++ ovdb.pod 2013-01-16 19:29:51 UTC (rev 9456)
@@ -50,7 +50,7 @@
To enable ovdb, set the I<ovmethod> parameter in F<inn.conf> to C<ovdb>.
The ovdb database is stored in the directory specified by the
-I<pathoverview> paramter in F<inn.conf>. This is the "DB_HOME" directory.
+I<pathoverview> parameter in F<inn.conf>. This is the "DB_HOME" directory.
To start out, this directory should be empty (other than an optional
F<DB_CONFIG> file; see L<DB_CONFIG> for details) and B<innd> (or
B<makehistory>) will create the files as necessary in that directory.
------------------------------
Message: 3
Date: Wed, 16 Jan 2013 13:54:43 -0800 (PST)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk (6 files)
Message-ID: <20130116215443.9b9bb67...@hope.eyrie.org>
Date: Wednesday, January 16, 2013 @ 13:54:43
Author: iulius
Revision: 9457
test suite: remove a useless wrapped test for setenv
Remove a test that makes the test suite fail on a few systems.
The code it is testing is obvious whereas getting the amount of
memory and the data size limits right is extremely difficult
in all cases. Besides, this test does not serve much purpose
and is not present in rra-c-util 4.7.
Modified:
trunk/MANIFEST
trunk/support/mkmanifest
trunk/tests/Makefile
trunk/tests/lib/ (properties)
trunk/tests/lib/setenv-t.c
Deleted:
trunk/tests/lib/setenv.t
----------------------+
MANIFEST | 1 -
support/mkmanifest | 2 +-
tests/Makefile | 6 +++---
tests/lib/setenv-t.c | 22 +---------------------
tests/lib/setenv.t | 17 -----------------
5 files changed, 5 insertions(+), 43 deletions(-)
Modified: MANIFEST
===================================================================
--- MANIFEST 2013-01-16 19:29:51 UTC (rev 9456)
+++ MANIFEST 2013-01-16 21:54:43 UTC (rev 9457)
@@ -880,7 +880,6 @@
tests/lib/pwrite-t.c Tests for lib/pwrite.c
tests/lib/qio-t.c Tests for lib/qio.c
tests/lib/setenv-t.c Tests for lib/setenv.c
-tests/lib/setenv.t Wrapper for setenv tests
tests/lib/snprintf-t.c Tests for lib/snprintf.c
tests/lib/strlcat-t.c Tests for lib/strlcat.c
tests/lib/strlcpy-t.c Tests for lib/strlcpy.c
Modified: support/mkmanifest
===================================================================
--- support/mkmanifest 2013-01-16 19:29:51 UTC (rev 9456)
+++ support/mkmanifest 2013-01-16 21:54:43 UTC (rev 9457)
@@ -284,7 +284,7 @@
tests/lib/pread.t
tests/lib/pwrite.t
tests/lib/qio.t
-tests/lib/setenv.tr
+tests/lib/setenv.t
tests/lib/snprintf.t
tests/lib/strlcat.t
tests/lib/strlcpy.t
Modified: tests/Makefile
===================================================================
--- tests/Makefile 2013-01-16 19:29:51 UTC (rev 9456)
+++ tests/Makefile 2013-01-16 21:54:43 UTC (rev 9457)
@@ -17,14 +17,14 @@
lib/hashtab.t lib/hex.t lib/inet_aton.t \
lib/inet_ntoa.t lib/inet_ntop.t lib/innconf.t lib/list.t lib/md5.t \
lib/memcmp.t lib/messages.t lib/mkstemp.t lib/network.t lib/pread.t \
- lib/pwrite.t lib/qio.t lib/snprintf.t lib/strlcat.t \
+ lib/pwrite.t lib/qio.t lib/setenv.t lib/snprintf.t lib/strlcat.t \
lib/strlcpy.t lib/tst.t lib/uwildmat.t lib/vector.t lib/wire.t \
lib/xwrite.t nnrpd/auth-ext.t overview/api.t overview/buffindexed.t \
overview/tradindexed.t overview/xref.t util/innbind.t
## Extra stuff that needs to be built before tests can be run.
-EXTRA = runtests clients/server-list lib/setenv.tr lib/xmalloc
+EXTRA = runtests clients/server-list lib/xmalloc
all check test tests: $(TESTS) $(EXTRA)
./runtests TESTS
@@ -192,7 +192,7 @@
lib/setenv.o: ../lib/setenv.c
$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/setenv.c
-lib/setenv.tr: lib/setenv.o lib/setenv-t.o libtest.o $(LIBINN)
+lib/setenv.t: lib/setenv.o lib/setenv-t.o libtest.o $(LIBINN)
$(LINK) lib/setenv.o lib/setenv-t.o libtest.o $(LIBINN)
lib/snprintf.o: ../lib/snprintf.c
Property changes on: trunk/tests/lib
___________________________________________________________________
Modified: svn:ignore
- .libs
.pure
asprintf.t
buffer.t
concat.t
conffile.t
confparse.t
date.t
dispatch.t
getaddrinfo.t
getnameinfo.t
hash.t
hashtab.t
hex.t
hstrerror.t
inet_aton.t
inet_ntoa.t
inet_ntop.t
innconf.t
list.t
md5.t
memcmp.t
messages.t
mkstemp.t
network.t
pread.t
pwrite.t
qio.t
setenv.tr
snprintf.t
strlcat.t
strlcpy.t
tst.t
uwildmat.t
vector.t
wire.t
xmalloc
xwrite.t
+ .libs
.pure
asprintf.t
buffer.t
concat.t
conffile.t
confparse.t
date.t
dispatch.t
getaddrinfo.t
getnameinfo.t
hash.t
hashtab.t
hex.t
hstrerror.t
inet_aton.t
inet_ntoa.t
inet_ntop.t
innconf.t
list.t
md5.t
memcmp.t
messages.t
mkstemp.t
network.t
pread.t
pwrite.t
qio.t
setenv.t
snprintf.t
strlcat.t
strlcpy.t
tst.t
uwildmat.t
vector.t
wire.t
xmalloc
xwrite.t
Modified: tests/lib/setenv-t.c
===================================================================
--- tests/lib/setenv-t.c 2013-01-16 19:29:51 UTC (rev 9456)
+++ tests/lib/setenv-t.c 2013-01-16 21:54:43 UTC (rev 9457)
@@ -37,11 +37,8 @@
int
main(void)
{
- char *value;
- int status;
+ plan(8);
- plan(12);
-
if (getenv(test_var))
bail("%s already in the environment!", test_var);
@@ -54,22 +51,5 @@
ok(test_setenv(test_var, "", 1) == 0, "overwrite with empty string");
is_string("", getenv(test_var), "...and getenv correct");
- /* We're run by a shell script wrapper that sets resource limits such
- * that we can allocate one string of this size but not two. Note that
- * Linux doesn't support data limits, so skip if we get an unexpected
- * success here.
- */
- value = xmalloc(100 * 1024);
- memset(value, 'A', 100 * 1024 - 1);
- value[100 * 1024 - 1] = 0;
- ok(test_setenv(test_var, value, 0) == 0, "set string 3");
- is_string("", getenv(test_var), "...and getenv empty");
- status = test_setenv(test_var, value, 1);
- if (status == 0) {
- skip_block(2, "no data limit support");
- } else {
- ok((status == -1) && (errno == ENOMEM), "overwrite string 3");
- is_string("", getenv(test_var), "...and getenv still empty");
- }
return 0;
}
Deleted: tests/lib/setenv.t
===================================================================
--- tests/lib/setenv.t 2013-01-16 19:29:51 UTC (rev 9456)
+++ tests/lib/setenv.t 2013-01-16 21:54:43 UTC (rev 9457)
@@ -1,17 +0,0 @@
-#! /bin/sh
-# $Id$
-#
-# Wrapper around the setenv test suite to set a resource limit low enough
-# that two strings over 100KB can't both be allocated, allowing the memory
-# allocation failure code in setenv to be exercised. Done with this
-# wrapper because ulimit is more easily portable than the corresponding C
-# code.
-
-# Find where the test suite is.
-setenv=setenv.tr
-for file in ./setenv.tr lib/setenv.tr tests/lib/setenv.tr ; do
- [ -x $file ] && setenv=$file
-done
-
-ulimit -d 150
-exec $setenv
------------------------------
Message: 4
Date: Wed, 16 Jan 2013 13:57:16 -0800 (PST)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: branches/2.5 (6 files)
Message-ID: <20130116215716.ea02867...@hope.eyrie.org>
Date: Wednesday, January 16, 2013 @ 13:57:16
Author: iulius
Revision: 9458
test suite: remove a useless wrapped test for setenv
Remove a test that makes the test suite fail on a few systems.
The code it is testing is obvious whereas getting the amount of
memory and the data size limits right is extremely difficult
in all cases. Besides, this test does not serve much purpose
and is not present in rra-c-util 4.7.
Modified:
branches/2.5/MANIFEST
branches/2.5/support/mkmanifest
branches/2.5/tests/Makefile
branches/2.5/tests/lib/ (properties)
branches/2.5/tests/lib/setenv-t.c
Deleted:
branches/2.5/tests/lib/setenv.t
----------------------+
MANIFEST | 1 -
support/mkmanifest | 2 +-
tests/Makefile | 6 +++---
tests/lib/setenv-t.c | 22 +---------------------
tests/lib/setenv.t | 17 -----------------
5 files changed, 5 insertions(+), 43 deletions(-)
Modified: MANIFEST
===================================================================
--- MANIFEST 2013-01-16 21:54:43 UTC (rev 9457)
+++ MANIFEST 2013-01-16 21:57:16 UTC (rev 9458)
@@ -882,7 +882,6 @@
tests/lib/pwrite-t.c Tests for lib/pwrite.c
tests/lib/qio-t.c Tests for lib/qio.c
tests/lib/setenv-t.c Tests for lib/setenv.c
-tests/lib/setenv.t Wrapper for setenv tests
tests/lib/snprintf-t.c Tests for lib/snprintf.c
tests/lib/strlcat-t.c Tests for lib/strlcat.c
tests/lib/strlcpy-t.c Tests for lib/strlcpy.c
Modified: support/mkmanifest
===================================================================
--- support/mkmanifest 2013-01-16 21:54:43 UTC (rev 9457)
+++ support/mkmanifest 2013-01-16 21:57:16 UTC (rev 9458)
@@ -285,7 +285,7 @@
tests/lib/pread.t
tests/lib/pwrite.t
tests/lib/qio.t
-tests/lib/setenv.tr
+tests/lib/setenv.t
tests/lib/snprintf.t
tests/lib/strlcat.t
tests/lib/strlcpy.t
Modified: tests/Makefile
===================================================================
--- tests/Makefile 2013-01-16 21:54:43 UTC (rev 9457)
+++ tests/Makefile 2013-01-16 21:57:16 UTC (rev 9458)
@@ -17,14 +17,14 @@
lib/hashtab.t lib/hex.t lib/hstrerror.t lib/inet_aton.t \
lib/inet_ntoa.t lib/inet_ntop.t lib/innconf.t lib/list.t lib/md5.t \
lib/memcmp.t lib/messages.t lib/mkstemp.t lib/network.t lib/pread.t \
- lib/pwrite.t lib/qio.t lib/snprintf.t lib/strlcat.t \
+ lib/pwrite.t lib/qio.t lib/setenv.t lib/snprintf.t lib/strlcat.t \
lib/strlcpy.t lib/tst.t lib/uwildmat.t lib/vector.t lib/wire.t \
lib/xwrite.t nnrpd/auth-ext.t overview/api.t overview/buffindexed.t \
overview/tradindexed.t overview/xref.t util/innbind.t
## Extra stuff that needs to be built before tests can be run.
-EXTRA = runtests clients/server-list lib/setenv.tr lib/xmalloc
+EXTRA = runtests clients/server-list lib/xmalloc
all check test tests: $(TESTS) $(EXTRA)
./runtests TESTS
@@ -198,7 +198,7 @@
lib/setenv.o: ../lib/setenv.c
$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/setenv.c
-lib/setenv.tr: lib/setenv.o lib/setenv-t.o libtest.o $(LIBINN)
+lib/setenv.t: lib/setenv.o lib/setenv-t.o libtest.o $(LIBINN)
$(LINK) lib/setenv.o lib/setenv-t.o libtest.o $(LIBINN)
lib/snprintf.o: ../lib/snprintf.c
Property changes on: branches/2.5/tests/lib
___________________________________________________________________
Modified: svn:ignore
- .libs
.pure
asprintf.t
buffer.t
concat.t
conffile.t
confparse.t
date.t
dispatch.t
getaddrinfo.t
getnameinfo.t
hash.t
hashtab.t
hex.t
hstrerror.t
inet_aton.t
inet_ntoa.t
inet_ntop.t
innconf.t
list.t
md5.t
memcmp.t
messages.t
mkstemp.t
network.t
pread.t
pwrite.t
qio.t
setenv.tr
snprintf.t
strlcat.t
strlcpy.t
tst.t
uwildmat.t
vector.t
wire.t
xmalloc
xwrite.t
+ .libs
.pure
asprintf.t
buffer.t
concat.t
conffile.t
confparse.t
date.t
dispatch.t
getaddrinfo.t
getnameinfo.t
hash.t
hashtab.t
hex.t
hstrerror.t
inet_aton.t
inet_ntoa.t
inet_ntop.t
innconf.t
list.t
md5.t
memcmp.t
messages.t
mkstemp.t
network.t
pread.t
pwrite.t
qio.t
setenv.t
snprintf.t
strlcat.t
strlcpy.t
tst.t
uwildmat.t
vector.t
wire.t
xmalloc
xwrite.t
Modified: tests/lib/setenv-t.c
===================================================================
--- tests/lib/setenv-t.c 2013-01-16 21:54:43 UTC (rev 9457)
+++ tests/lib/setenv-t.c 2013-01-16 21:57:16 UTC (rev 9458)
@@ -18,13 +18,10 @@
int
main(void)
{
- char *value;
- int status;
-
if (getenv(test_var))
die("%s already in the environment!", test_var);
- test_init(12);
+ test_init(8);
ok(1, test_setenv(test_var, test_value1, 0) == 0);
ok_string(2, test_value1, getenv(test_var));
@@ -35,22 +32,5 @@
ok(7, test_setenv(test_var, "", 1) == 0);
ok_string(8, "", getenv(test_var));
- /* We're run by a shell script wrapper that sets resource limits such
- that we can allocate one string of this size but not two. Note that
- Linux doesn't support data limits, so skip if we get an unexpected
- success here. */
- value = xmalloc(100 * 1024);
- memset(value, 'A', 100 * 1024 - 1);
- value[100 * 1024 - 1] = 0;
- ok(9, test_setenv(test_var, value, 0) == 0);
- ok_string(10, "", getenv(test_var));
- status = test_setenv(test_var, value, 1);
- if (status == 0) {
- skip_block(11, 2, "no data limit support");
- } else {
- ok(11, (status == -1) && (errno == ENOMEM));
- ok_string(12, "", getenv(test_var));
- }
-
return 0;
}
Deleted: tests/lib/setenv.t
===================================================================
--- tests/lib/setenv.t 2013-01-16 21:54:43 UTC (rev 9457)
+++ tests/lib/setenv.t 2013-01-16 21:57:16 UTC (rev 9458)
@@ -1,17 +0,0 @@
-#! /bin/sh
-# $Id$
-#
-# Wrapper around the setenv test suite to set a resource limit low enough
-# that two strings over 100KB can't both be allocated, allowing the memory
-# allocation failure code in setenv to be exercised. Done with this
-# wrapper because ulimit is more easily portable than the corresponding C
-# code.
-
-# Find where the test suite is.
-setenv=setenv.tr
-for file in ./setenv.tr lib/setenv.tr tests/lib/setenv.tr ; do
- [ -x $file ] && setenv=$file
-done
-
-ulimit -d 150
-exec $setenv
------------------------------
_______________________________________________
inn-committers mailing list
inn-committers@lists.isc.org
https://lists.isc.org/mailman/listinfo/inn-committers
End of inn-committers Digest, Vol 47, Issue 1
*********************************************
