Added globals to support getdns_cancel_callback() tests.

Fixed macro evaluation problem in ASSERT_RC.
This commit is contained in:
Craig E. Despeaux 2014-01-06 12:59:43 -05:00
parent c8a7180a3a
commit c736df8a89
2 changed files with 13 additions and 8 deletions

View File

@ -8,6 +8,8 @@
#include "check_getdns_common.h" #include "check_getdns_common.h"
int callback_called = 0; int callback_called = 0;
int callback_completed = 0;
int callback_canceled = 0;
/* /*
* extract_response extracts all of the various information * extract_response extracts all of the various information

View File

@ -6,6 +6,8 @@
#define MAXLEN 200 #define MAXLEN 200
extern int callback_called; extern int callback_called;
extern int callback_completed;
extern int callback_canceled;
struct extracted_response { struct extracted_response {
uint32_t top_answer_type; uint32_t top_answer_type;
@ -33,10 +35,11 @@
{ \ { \
size_t buflen = MAXLEN; \ size_t buflen = MAXLEN; \
char error_string[MAXLEN]; \ char error_string[MAXLEN]; \
getdns_strerror(rc, error_string, buflen); \ getdns_return_t evaluated_rc = rc; \
ck_assert_msg(rc == expected_rc, \ getdns_strerror(evaluated_rc, error_string, buflen); \
ck_assert_msg(evaluated_rc == expected_rc, \
"%s: expecting %s: %d, but received: %d: %s", \ "%s: expecting %s: %d, but received: %d: %s", \
prefix, #expected_rc, expected_rc, rc, error_string); \ prefix, #expected_rc, expected_rc, evaluated_rc, error_string); \
} }
/* /*