CVS commit: src/external/bsd/libevent/dist/test

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Thu Apr 11 20:14:44 UTC 2013

Modified Files:
        src/external/bsd/libevent/dist/test: regress.c regress_dns.c

Log Message:
fix merge that broke the tests


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libevent/dist/test/regress.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libevent/dist/test/regress_dns.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/external/bsd/libevent/dist/test/regress.c
diff -u src/external/bsd/libevent/dist/test/regress.c:1.5 src/external/bsd/libevent/dist/test/regress.c:1.6
--- src/external/bsd/libevent/dist/test/regress.c:1.5	Thu Apr 11 12:56:42 2013
+++ src/external/bsd/libevent/dist/test/regress.c	Thu Apr 11 16:14:44 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: regress.c,v 1.5 2013/04/11 16:56:42 christos Exp $	*/
+/*	$NetBSD: regress.c,v 1.6 2013/04/11 20:14:44 christos Exp $	*/
 /*
  * Copyright (c) 2003-2007 Niels Provos <pro...@citi.umich.edu>
  * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
@@ -33,7 +33,7 @@
 
 #include "event2/event-config.h"
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: regress.c,v 1.5 2013/04/11 16:56:42 christos Exp $");
+__RCSID("$NetBSD: regress.c,v 1.6 2013/04/11 20:14:44 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -580,7 +580,6 @@ end:
 	cleanup_test();
 }
 
-#if 0
 static void
 test_simpletimeout(void)
 {
@@ -599,7 +598,6 @@ test_simpletimeout(void)
 
 	cleanup_test();
 }
-#endif
 
 static void
 periodic_timeout_cb(evutil_socket_t fd, short event, void *arg)

Index: src/external/bsd/libevent/dist/test/regress_dns.c
diff -u src/external/bsd/libevent/dist/test/regress_dns.c:1.3 src/external/bsd/libevent/dist/test/regress_dns.c:1.4
--- src/external/bsd/libevent/dist/test/regress_dns.c:1.3	Thu Apr 11 12:56:42 2013
+++ src/external/bsd/libevent/dist/test/regress_dns.c	Thu Apr 11 16:14:44 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: regress_dns.c,v 1.3 2013/04/11 16:56:42 christos Exp $	*/
+/*	$NetBSD: regress_dns.c,v 1.4 2013/04/11 20:14:44 christos Exp $	*/
 /*
  * Copyright (c) 2003-2007 Niels Provos <pro...@citi.umich.edu>
  * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
@@ -34,7 +34,7 @@
 
 #include "event2/event-config.h"
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: regress_dns.c,v 1.3 2013/04/11 16:56:42 christos Exp $");
+__RCSID("$NetBSD: regress_dns.c,v 1.4 2013/04/11 20:14:44 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -79,10 +79,8 @@ __RCSID("$NetBSD: regress_dns.c,v 1.3 20
 static int dns_ok = 0;
 static int dns_got_cancel = 0;
 static int dns_err = 0;
-#endif
 
 
-#if 0
 static void
 dns_gethostbyname_cb(int result, char type, int count, int ttl,
     void *addresses, void *arg)
@@ -223,7 +221,6 @@ end:
 	if (base)
 		event_base_free(base);
 }
-#endif
 
 static int n_server_responses = 0;