Author: abartlet Date: 2006-06-23 21:05:45 +0000 (Fri, 23 Jun 2006) New Revision: 16489
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16489 Log: Because the torture/ui.h file isn't automaticly generated, the prototypes in it need to use the PRINTF_ATTRIBUTE() macro, rather than _PRINTF_ATTRIBUTE() (which becomes PRINTF_ATTRIBUTE() only in proto files, but not C files). This found a number of missing descriptions in the LOCAL-SOCKET test. Andrew Bartlett Modified: branches/SAMBA_4_0/source/torture/local/socket.c branches/SAMBA_4_0/source/torture/ui.c branches/SAMBA_4_0/source/torture/ui.h Changeset: Modified: branches/SAMBA_4_0/source/torture/local/socket.c =================================================================== --- branches/SAMBA_4_0/source/torture/local/socket.c 2006-06-23 21:01:13 UTC (rev 16488) +++ branches/SAMBA_4_0/source/torture/local/socket.c 2006-06-23 21:05:45 UTC (rev 16489) @@ -41,11 +41,11 @@ BOOL ret = True; status = socket_create("ip", SOCKET_TYPE_DGRAM, &sock1, 0); - torture_assert_ntstatus_ok(test, status, NULL); + torture_assert_ntstatus_ok(test, status, "creating DGRAM IP socket 1"); talloc_steal(test, sock1); status = socket_create("ip", SOCKET_TYPE_DGRAM, &sock2, 0); - torture_assert_ntstatus_ok(test, status, NULL); + torture_assert_ntstatus_ok(test, status, "creating DGRAM IP socket 1"); talloc_steal(test, sock2); localhost = socket_address_from_strings(sock1, sock1->backend_name, @@ -54,7 +54,7 @@ torture_assert(test, localhost, "Localhost not found"); status = socket_listen(sock1, localhost, 0, 0); - torture_assert_ntstatus_ok(test, status, NULL); + torture_assert_ntstatus_ok(test, status, "listen on socket 1") srv_addr = socket_get_my_addr(sock1, test); if (srv_addr == NULL || strcmp(srv_addr->addr, iface_best_ip("127.0.0.1")) != 0) { @@ -71,11 +71,11 @@ sent = size; status = socket_sendto(sock2, &blob, &sent, srv_addr); - torture_assert_ntstatus_ok(test, status, NULL); + torture_assert_ntstatus_ok(test, status, "sendto() on socket 2"); status = socket_recvfrom(sock1, blob2.data, size, &nread, sock1, &from_addr); - torture_assert_ntstatus_ok(test, status, NULL); + torture_assert_ntstatus_ok(test, status, "recvfrom() on socket 1"); if (strcmp(from_addr->addr, srv_addr->addr) != 0) { torture_fail(test, "Unexpected recvfrom addr %s", from_addr->addr); @@ -92,11 +92,11 @@ generate_random_buffer(blob.data, blob.length); status = socket_sendto(sock1, &blob, &sent, from_addr); - torture_assert_ntstatus_ok(test, status, NULL); + torture_assert_ntstatus_ok(test, status, "sendto() on socket 1"); status = socket_recvfrom(sock2, blob2.data, size, &nread, sock2, &from_addr); - torture_assert_ntstatus_ok(test, status, NULL); + torture_assert_ntstatus_ok(test, status, "recvfrom() on socket 2"); if (strcmp(from_addr->addr, srv_addr->addr) != 0) { torture_fail(test, "Unexpected recvfrom addr %s\n", from_addr->addr); return False; @@ -137,11 +137,11 @@ struct event_context *ev = event_context_init(test); status = socket_create("ip", SOCKET_TYPE_STREAM, &sock1, 0); - torture_assert_ntstatus_ok(test, status, NULL); + torture_assert_ntstatus_ok(test, status, "creating IP stream socket 1"); talloc_steal(test, sock1); status = socket_create("ip", SOCKET_TYPE_STREAM, &sock2, 0); - torture_assert_ntstatus_ok(test, status, NULL); + torture_assert_ntstatus_ok(test, status, "creating IP stream socket 1"); talloc_steal(test, sock2); localhost = socket_address_from_strings(sock1, sock1->backend_name, @@ -149,7 +149,7 @@ torture_assert(test, localhost, "Localhost not found"); status = socket_listen(sock1, localhost, 0, 0); - torture_assert_ntstatus_ok(test, status, NULL); + torture_assert_ntstatus_ok(test, status, "listen on socket 1"); srv_addr = socket_get_my_addr(sock1, test); torture_assert(test, srv_addr && srv_addr->addr, @@ -164,10 +164,10 @@ torture_comment(test, "server port is %d", srv_addr->port); status = socket_connect_ev(sock2, NULL, srv_addr, 0, ev); - torture_assert_ntstatus_ok(test, status, NULL); + torture_assert_ntstatus_ok(test, status, "connect() on socket 2") status = socket_accept(sock1, &sock3); - torture_assert_ntstatus_ok(test, status, NULL); + torture_assert_ntstatus_ok(test, status, "accept() on socket 1"); talloc_steal(test, sock3); talloc_free(sock1); @@ -177,10 +177,10 @@ sent = size; status = socket_send(sock2, &blob, &sent); - torture_assert_ntstatus_ok(test, status, NULL); + torture_assert_ntstatus_ok(test, status, "send() on socket 2"); status = socket_recv(sock3, blob2.data, size, &nread); - torture_assert_ntstatus_ok(test, status, NULL); + torture_assert_ntstatus_ok(test, status, "recv() on socket 3"); from_addr = socket_get_peer_addr(sock3, test); Modified: branches/SAMBA_4_0/source/torture/ui.c =================================================================== --- branches/SAMBA_4_0/source/torture/ui.c 2006-06-23 21:01:13 UTC (rev 16488) +++ branches/SAMBA_4_0/source/torture/ui.c 2006-06-23 21:05:45 UTC (rev 16489) @@ -23,7 +23,7 @@ #include "torture/ui.h" #include "dlinklist.h" -void torture_comment(struct torture_context *context, const char *comment, ...) _PRINTF_ATTRIBUTE(2,3) +void torture_comment(struct torture_context *context, const char *comment, ...) { va_list ap; char *tmp; @@ -39,7 +39,7 @@ talloc_free(tmp); } -void torture_fail(struct torture_context *context, const char *fmt, ...) _PRINTF_ATTRIBUTE(2,3) +void torture_fail(struct torture_context *context, const char *fmt, ...) { va_list ap; @@ -49,7 +49,7 @@ context->last_result = TORTURE_FAIL; } -void torture_skip(struct torture_context *context, const char *fmt, ...) _PRINTF_ATTRIBUTE(2,3) +void torture_skip(struct torture_context *context, const char *fmt, ...) { va_list ap; context->skipped++; Modified: branches/SAMBA_4_0/source/torture/ui.h =================================================================== --- branches/SAMBA_4_0/source/torture/ui.h 2006-06-23 21:01:13 UTC (rev 16488) +++ branches/SAMBA_4_0/source/torture/ui.h 2006-06-23 21:05:45 UTC (rev 16489) @@ -161,9 +161,9 @@ #define torture_assert_werr_ok(ctx,expr,string) \ torture_assert_werr_equal(ctx,expr,WERR_OK,string) -void torture_comment(struct torture_context *test, const char *comment, ...) _PRINTF_ATTRIBUTE(2,3); -void torture_fail(struct torture_context *test, const char *reason, ...) _PRINTF_ATTRIBUTE(2,3); -void torture_skip(struct torture_context *test, const char *reason, ...) _PRINTF_ATTRIBUTE(2,3); +void torture_comment(struct torture_context *test, const char *comment, ...) PRINTF_ATTRIBUTE(2,3); +void torture_fail(struct torture_context *test, const char *reason, ...) PRINTF_ATTRIBUTE(2,3); +void torture_skip(struct torture_context *test, const char *reason, ...) PRINTF_ATTRIBUTE(2,3); const char *torture_setting(struct torture_context *test, const char *name, const char *default_value);
