fix merge issue

This commit is contained in:
Nitin Singh 2014-02-11 16:39:35 -05:00
parent b84c13748c
commit c9b3ed898e
2 changed files with 3 additions and 2 deletions

View File

@ -85,6 +85,7 @@ main (int argc, char** argv)
Suite *getdns_context_set_upstream_recursive_servers_suite(void); Suite *getdns_context_set_upstream_recursive_servers_suite(void);
Suite *getdns_service_suite(void); Suite *getdns_service_suite(void);
Suite *getdns_service_sync_suite(void); Suite *getdns_service_sync_suite(void);
Suite *getdns_context_set_timeout_suite(void);
sr = srunner_create(getdns_general_suite()); sr = srunner_create(getdns_general_suite());
srunner_add_suite(sr, getdns_general_sync_suite()); srunner_add_suite(sr, getdns_general_sync_suite());

View File

@ -13,7 +13,7 @@
{ {
/* /*
* context = NULL * context = NULL
* expect: GETDNS_RETURN_BAD_CONTEXT * expect: GETDNS_RETURN_INVALID_PARAMETER
*/ */
struct getdns_context *context = NULL; struct getdns_context *context = NULL;
struct getdns_dict *response = NULL; struct getdns_dict *response = NULL;
@ -27,7 +27,7 @@
{ {
/* /*
* name = NULL * name = NULL
* expect: GETDNS_RETURN_BAD_CONTEXT * expect: GETDNS_RETURN_INVALID_PARAMETER
*/ */
struct getdns_context *context = NULL; struct getdns_context *context = NULL;
struct getdns_dict *response = NULL; struct getdns_dict *response = NULL;