Fri Apr 12 21:49:54 2013 UTC ()
missed one xkill in the rename


(christos)
diff -r1.2 -r1.3 src/external/bsd/libevent/dist/test/regress_rpc.c
cvs diff -r1.2 -r1.3 src/external/bsd/libevent/dist/test/regress_rpc.c (expand / switch to unified diff)

--- src/external/bsd/libevent/dist/test/regress_rpc.c 2013/04/11 16:56:42 1.2
+++ src/external/bsd/libevent/dist/test/regress_rpc.c 2013/04/12 21:49:54 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: regress_rpc.c,v 1.2 2013/04/11 16:56:42 christos Exp $ */ 1/* $NetBSD: regress_rpc.c,v 1.3 2013/04/12 21:49:54 christos Exp $ */
2/* 2/*
3 * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu> 3 * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu>
4 * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson 4 * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 3. The name of the author may not be used to endorse or promote products 14 * 3. The name of the author may not be used to endorse or promote products
@@ -26,27 +26,27 @@ @@ -26,27 +26,27 @@
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29/* The old tests here need assertions to work. */ 29/* The old tests here need assertions to work. */
30#undef NDEBUG 30#undef NDEBUG
31 31
32#ifdef WIN32 32#ifdef WIN32
33#include <winsock2.h> 33#include <winsock2.h>
34#include <windows.h> 34#include <windows.h>
35#endif 35#endif
36 36
37#include "event2/event-config.h" 37#include "event2/event-config.h"
38#include <sys/cdefs.h> 38#include <sys/cdefs.h>
39__RCSID("$NetBSD: regress_rpc.c,v 1.2 2013/04/11 16:56:42 christos Exp $"); 39__RCSID("$NetBSD: regress_rpc.c,v 1.3 2013/04/12 21:49:54 christos Exp $");
40 40
41#include <sys/types.h> 41#include <sys/types.h>
42#include <sys/stat.h> 42#include <sys/stat.h>
43#ifdef _EVENT_HAVE_SYS_TIME_H 43#ifdef _EVENT_HAVE_SYS_TIME_H
44#include <sys/time.h> 44#include <sys/time.h>
45#endif 45#endif
46#include <sys/queue.h> 46#include <sys/queue.h>
47#ifndef WIN32 47#ifndef WIN32
48#include <sys/socket.h> 48#include <sys/socket.h>
49#include <signal.h> 49#include <signal.h>
50#include <unistd.h> 50#include <unistd.h>
51#include <netdb.h> 51#include <netdb.h>
52#endif 52#endif
@@ -490,27 +490,27 @@ rpc_basic_client(void) @@ -490,27 +490,27 @@ rpc_basic_client(void)
490 490
491 EVRPC_MAKE_REQUEST(Message, pool, msg, xkill, GotKillCb, NULL); 491 EVRPC_MAKE_REQUEST(Message, pool, msg, xkill, GotKillCb, NULL);
492 492
493 event_dispatch(); 493 event_dispatch();
494 494
495 tt_assert(test_ok == 2); 495 tt_assert(test_ok == 2);
496 496
497 /* we do it trice to make sure other stuff works, too */ 497 /* we do it trice to make sure other stuff works, too */
498 kill_clear(xkill); 498 kill_clear(xkill);
499 499
500 { 500 {
501 struct evrpc_request_wrapper *ctx = 501 struct evrpc_request_wrapper *ctx =
502 EVRPC_MAKE_CTX(Message, msg, kill, 502 EVRPC_MAKE_CTX(Message, msg, kill,
503 pool, msg, kill, GotKillCb, NULL); 503 pool, msg, xkill, GotKillCb, NULL);
504 evrpc_make_request(ctx); 504 evrpc_make_request(ctx);
505 } 505 }
506 506
507 event_dispatch(); 507 event_dispatch();
508 508
509 rpc_teardown(base); 509 rpc_teardown(base);
510 510
511 tt_assert(test_ok == 3); 511 tt_assert(test_ok == 3);
512 512
513end: 513end:
514 if (msg) 514 if (msg)
515 msg_free(msg); 515 msg_free(msg);
516 if (xkill) 516 if (xkill)