Merge remote branch 'sf/product-2-2' into develop

[netatalk.git] / libevent / test / regress_rpc.c

diff --git a/libevent/test/regress_rpc.c b/libevent/test/regress_rpc.c
index 9362e493da67b8fafd4eb836bc7d91dc170466e6..922fdc1031c557546666c992a05d7a08e3e8b22f 100644 (file)
--- a/libevent/test/regress_rpc.c
+++ b/libevent/test/regress_rpc.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu>
- * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -71,6 +71,8 @@
 #include "regress.h"
 #include "regress_testutils.h"
 
+#ifndef NO_PYTHON_EXISTS
+
 static struct evhttp *
 http_setup(ev_uint16_t *pport)
 {
@@ -870,6 +872,13 @@ end:
        { #name, run_legacy_test_fn, TT_FORK|TT_NEED_BASE|TT_LEGACY,    \
                    &legacy_setup,                                      \
                    rpc_##name }
+#else
+/* NO_PYTHON_EXISTS */
+
+#define RPC_LEGACY(name) \
+       { #name, NULL, TT_SKIP, NULL, NULL }
+
+#endif
 
 struct testcase_t rpc_testcases[] = {
        RPC_LEGACY(basic_test),