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 (6 files) (INN Commit)
2. INN commit: trunk/tests (Makefile) (INN Commit)
----------------------------------------------------------------------
Message: 1
Date: Sun, 7 Sep 2014 03:59:17 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk (6 files)
Message-ID: <20140907105917.6d76267...@hope.eyrie.org>
Date: Sunday, September 7, 2014 @ 03:59:17
Author: iulius
Revision: 9684
Add a fdflag test suite
Fetched from upstream rra-c-util.
Added:
trunk/tests/lib/fdflag-t.c
Modified:
trunk/MANIFEST
trunk/support/mkmanifest
trunk/tests/Makefile
trunk/tests/TESTS
trunk/tests/lib/ (properties)
----------------------+
MANIFEST | 1
support/mkmanifest | 1
tests/Makefile | 6 +-
tests/TESTS | 1
tests/lib/fdflag-t.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 131 insertions(+), 1 deletion(-)
Modified: MANIFEST
===================================================================
--- MANIFEST 2014-09-07 10:44:11 UTC (rev 9683)
+++ MANIFEST 2014-09-07 10:59:17 UTC (rev 9684)
@@ -878,6 +878,7 @@
tests/lib/date-t.c Tests for lib/date.c
tests/lib/dispatch-t.c Tests for lib/dispatch.c
tests/lib/fakewrite.c Helper functions for xwrite tests
+tests/lib/fdflag-t-c Tests for lib/fdflag.c
tests/lib/getaddrinfo-t.c Tests for lib/getaddrinfo.c
tests/lib/getnameinfo-t.c Tests for lib/getnameinfo.c
tests/lib/hash-t.c Tests for lib/hash.c
Modified: support/mkmanifest
===================================================================
--- support/mkmanifest 2014-09-07 10:44:11 UTC (rev 9683)
+++ support/mkmanifest 2014-09-07 10:59:17 UTC (rev 9684)
@@ -266,6 +266,7 @@
tests/lib/confparse.t
tests/lib/date.t
tests/lib/dispatch.t
+tests/lib/fdflag.t
tests/lib/getaddrinfo.t
tests/lib/getnameinfo.t
tests/lib/hash.t
Modified: tests/Makefile
===================================================================
--- tests/Makefile 2014-09-07 10:44:11 UTC (rev 9683)
+++ tests/Makefile 2014-09-07 10:59:17 UTC (rev 9684)
@@ -17,7 +17,8 @@
TESTS = authprogs/ident.t innd/artparse.t innd/chan.t lib/asprintf.t \
lib/buffer.t lib/concat.t lib/conffile.t lib/confparse.t lib/date.t \
- lib/dispatch.t lib/getaddrinfo.t lib/getnameinfo.t lib/hash.t \
+ lib/dispatch.t lib/fdflag.t \
+ lib/getaddrinfo.t lib/getnameinfo.t lib/hash.t \
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 \
@@ -105,6 +106,9 @@
lib/dispatch.t: lib/dispatch-t.o tap/basic.o $(LIBINN)
$(LINK) lib/dispatch-t.o tap/basic.o $(LIBINN)
+lib/fdflag.t: lib/fdflag.o lib/fdflag-t.o tap/basic.o $(LIBINN)
+ $(LINK) lib/fdflag.o lib/fdflag-t.o tap/basic.o $(LIBINN) $(LIBS)
+
lib/getaddrinfo.o: ../lib/getaddrinfo.c
$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/getaddrinfo.c
Modified: tests/TESTS
===================================================================
--- tests/TESTS 2014-09-07 10:44:11 UTC (rev 9683)
+++ tests/TESTS 2014-09-07 10:59:17 UTC (rev 9684)
@@ -11,6 +11,7 @@
lib/confparse
lib/date
lib/dispatch
+lib/fdflag
lib/getaddrinfo
lib/getnameinfo
lib/hash
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
reallocarray.t
setenv.t
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
fdflag.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
reallocarray.t
setenv.t
snprintf.t
strlcat.t
strlcpy.t
tst.t
uwildmat.t
vector.t
wire.t
xmalloc
xwrite.t
Added: tests/lib/fdflag-t.c
===================================================================
--- tests/lib/fdflag-t.c (rev 0)
+++ tests/lib/fdflag-t.c 2014-09-07 10:59:17 UTC (rev 9684)
@@ -0,0 +1,123 @@
+/* $Id: getrra-c-util 9660 2014-08-30 11:55:13Z iulius $
+ *
+ * fdflag test suite.
+ *
+ * The canonical version of this file is maintained in the rra-c-util package,
+ * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
+ *
+ * Written by Russ Allbery <ea...@eyrie.org>
+ * Copyright 2008, 2009
+ * The Board of Trustees of the Leland Stanford Junior University
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#define LIBTEST_NEW_FORMAT 1
+
+#include "config.h"
+#include "clibrary.h"
+#include "portable/socket.h"
+
+#include <errno.h>
+#include "portable/wait.h"
+
+#include "tap/basic.h"
+#include "inn/fdflag.h"
+
+
+int
+main(void)
+{
+ int master, data, out1, out2;
+ socklen_t size;
+ ssize_t status;
+ struct sockaddr_in sin;
+ pid_t child;
+ char buffer[] = "D";
+
+ plan(8);
+
+ /* Parent will create the socket first to get the port number. */
+ memset(&sin, '\0', sizeof(sin));
+ sin.sin_family = AF_INET;
+ master = socket(AF_INET, SOCK_STREAM, 0);
+ if (master == -1)
+ sysbail("socket creation failed");
+ if (bind(master, (struct sockaddr *) &sin, sizeof(sin)) < 0)
+ sysbail("bind failed");
+ size = sizeof(sin);
+ if (getsockname(master, (struct sockaddr *) &sin, &size) < 0)
+ sysbail("getsockname failed");
+ if (listen(master, 1) < 0)
+ sysbail("listen failed");
+
+ /* Duplicate standard output to test close-on-exec. */
+ out1 = 8;
+ out2 = 9;
+ if (dup2(fileno(stdout), out1) < 0)
+ sysbail("cannot dup stdout to fd 8");
+ if (dup2(fileno(stdout), out2) < 0)
+ sysbail("cannot dup stdout to fd 9");
+ ok(fdflag_close_exec(out1, true), "set fd 8 to close-on-exec");
+ ok(fdflag_close_exec(out2, true), "set fd 9 to close-on-exec");
+ ok(fdflag_close_exec(out2, false), "set fd 9 back to regular");
+
+ /*
+ * Fork, child closes the open socket and then tries to connect, parent
+ * calls listen() and accept() on it. Parent will then set the socket
+ * non-blocking and try to read from it to see what happens, then write to
+ * the socket and close it, triggering the child close and exit.
+ *
+ * Before the child exits, it will exec a shell that will print "no" to
+ * the duplicate of stdout that the parent created and then the ok to
+ * regular stdout.
+ */
+ child = fork();
+ if (child < 0) {
+ sysbail("fork failed");
+ } else if (child != 0) {
+ size = sizeof(sin);
+ data = accept(master, (struct sockaddr *) &sin, &size);
+ close(master);
+ if (data < 0)
+ sysbail("accept failed");
+ ok(fdflag_nonblocking(data, true), "set socket non-blocking");
+ status = read(data, buffer, sizeof(buffer));
+ is_int(-1, status, "got -1 from non-blocking read");
+ is_int(EAGAIN, errno, "...with EAGAIN errno");
+ if (write(data, buffer, sizeof(buffer)) < (ssize_t) sizeof(buffer))
+ sysbail("write failed");
+ close(data);
+ testnum += 2;
+ } else {
+ data = socket(AF_INET, SOCK_STREAM, 0);
+ if (data < 0)
+ sysbail("child socket failed");
+ if (connect(data, (struct sockaddr *) &sin, sizeof(sin)) < 0)
+ sysbail("child connect failed");
+ if (read(data, buffer, sizeof(buffer)) < (ssize_t) sizeof(buffer))
+ sysbail("read failed");
+ fclose(stderr);
+ execlp("sh", "sh", "-c",
+ "printf 'not ' >&8; echo ok 7; echo 'ok 8' >&9", (char *) 0);
+ sysbail("exec failed");
+ }
+ waitpid(child, NULL, 0);
+ exit(0);
+}
------------------------------
Message: 2
Date: Sun, 7 Sep 2014 04:10:41 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk/tests (Makefile)
Message-ID: <20140907111043.30c9067...@hope.eyrie.org>
Date: Sunday, September 7, 2014 @ 04:10:41
Author: iulius
Revision: 9685
No longer build a special messages library for the test suite
Further to the use of the new messages test library that no longer has
DEBUG parts, no longer build a special messages.o for our test suite.
Besides, fix the build line for the fdflag test suite.
Modified:
trunk/tests/Makefile
----------+
Makefile | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
Modified: Makefile
===================================================================
--- Makefile 2014-09-07 10:59:17 UTC (rev 9684)
+++ Makefile 2014-09-07 11:10:41 UTC (rev 9685)
@@ -106,8 +106,8 @@
lib/dispatch.t: lib/dispatch-t.o tap/basic.o $(LIBINN)
$(LINK) lib/dispatch-t.o tap/basic.o $(LIBINN)
-lib/fdflag.t: lib/fdflag.o lib/fdflag-t.o tap/basic.o $(LIBINN)
- $(LINK) lib/fdflag.o lib/fdflag-t.o tap/basic.o $(LIBINN) $(LIBS)
+lib/fdflag.t: lib/fdflag-t.o tap/basic.o $(LIBINN)
+ $(LINK) lib/fdflag-t.o tap/basic.o $(LIBINN) $(LIBS)
lib/getaddrinfo.o: ../lib/getaddrinfo.c
$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/getaddrinfo.c
@@ -165,15 +165,9 @@
lib/memcmp.t: lib/memcmp.o lib/memcmp-t.o tap/basic.o
$(LINK) lib/memcmp.o lib/memcmp-t.o tap/basic.o $(LIBINN)
-lib/messages.o: ../lib/messages.c
- $(CC) $(CFLAGS) -DDEBUG -c -o $@ ../lib/messages.c
+lib/messages.t: lib/messages-t.o tap/basic.o tap/process.o tap/string.o
$(LIBINN)
+ $(LINK) lib/messages-t.o tap/basic.o tap/process.o tap/string.o
$(LIBINN)
-lib/messages-t.o: lib/messages-t.c
- $(CC) $(CFLAGS) -DDEBUG -c -o $@ lib/messages-t.c
-
-lib/messages.t: lib/messages.o lib/messages-t.o tap/basic.o tap/process.o
tap/string.o $(LIBINN)
- $(LINK) lib/messages-t.o lib/messages.o tap/basic.o tap/process.o
tap/string.o $(LIBINN)
-
lib/mkstemp.o: ../lib/mkstemp.c
$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/mkstemp.c
------------------------------
_______________________________________________
inn-committers mailing list
inn-committers@lists.isc.org
https://lists.isc.org/mailman/listinfo/inn-committers
End of inn-committers Digest, Vol 67, Issue 7
*********************************************
