[src/trunk]: src/external/bsd/libevent/dist/test fix merge that broke the tests

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6c74a25dddaf
branches:  trunk
changeset: 786033:6c74a25dddaf
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Apr 11 20:14:44 2013 +0000

description:
fix merge that broke the tests

diffstat:

 external/bsd/libevent/dist/test/regress.c     |  6 ++----
 external/bsd/libevent/dist/test/regress_dns.c |  7 ++-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diffs (71 lines):

diff -r 6a25015cbb48 -r 6c74a25dddaf external/bsd/libevent/dist/test/regress.c
--- a/external/bsd/libevent/dist/test/regress.c Thu Apr 11 19:55:10 2013 +0000
+++ b/external/bsd/libevent/dist/test/regress.c Thu Apr 11 20:14:44 2013 +0000
@@ -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 <provos%citi.umich.edu@localhost>
  * 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 @@
        cleanup_test();
 }
 
-#if 0
 static void
 test_simpletimeout(void)
 {
@@ -599,7 +598,6 @@
 
        cleanup_test();
 }
-#endif
 
 static void
 periodic_timeout_cb(evutil_socket_t fd, short event, void *arg)
diff -r 6a25015cbb48 -r 6c74a25dddaf external/bsd/libevent/dist/test/regress_dns.c
--- a/external/bsd/libevent/dist/test/regress_dns.c     Thu Apr 11 19:55:10 2013 +0000
+++ b/external/bsd/libevent/dist/test/regress_dns.c     Thu Apr 11 20:14:44 2013 +0000
@@ -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 <provos%citi.umich.edu@localhost>
  * 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 @@
 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 @@
        if (base)
                event_base_free(base);
 }
-#endif
 
 static int n_server_responses = 0;