grades overrun in test_heap_mean_operation() test funtion, adds test_reset_heap...

[simgrid.git] / testsuite / gras / trp_tcp_client.c

diff --git a/testsuite/gras/trp_tcp_client.c b/testsuite/gras/trp_tcp_client.c
index c21c1b6..bb58f8f 100644 (file)
--- a/testsuite/gras/trp_tcp_client.c
+++ b/testsuite/gras/trp_tcp_client.c
@@ -2,37 +2,36 @@
 
 /* trp_tcp_client: Client of a test case for the tcp transport.             */
 
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
+/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved.            */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <stdio.h>
-#include <gras.h>
+#include "gras.h"
 #include "gras/Transport/transport_interface.h"
 
-/*XBT_LOG_NEW_DEFAULT_CATEGORY(test);*/
+XBT_LOG_NEW_CATEGORY(test,"Logging for this test");
 
 int main(int argc,char *argv[]) {
   gras_socket_t sock;
-  xbt_error_t errcode;
   char data_send[256];
   char data_recv[256];
 
   memset(data_send, 0, sizeof(data_send));
   memset(data_recv, 0, sizeof(data_recv));
 
-  xbt_init_defaultlog(&argc,argv,"trp.thresh=debug");
+  gras_init(&argc,argv);
 
   fprintf(stderr,"===[CLIENT]=== Contact the server\n");
-  TRYFAIL(gras_socket_client(NULL,55555,&sock));
+  sock = gras_socket_client(NULL,55555);
 
   sprintf(data_send,"Hello, I am a little test data to send.");
   fprintf(stderr,"===[CLIENT]=== Send data\n");
-  TRYFAIL(gras_trp_chunk_send(sock,data_send, sizeof(data_send)));
-  TRYFAIL(gras_trp_flush(sock));
+  gras_trp_send(sock,data_send, sizeof(data_send),1);
+  gras_trp_flush(sock);
   fprintf(stderr,"===[CLIENT]=== Waiting for the ACK\n");
-  TRYFAIL(gras_trp_chunk_recv(sock,data_recv, sizeof(data_recv)));
+  gras_trp_recv(sock,data_recv, sizeof(data_recv));
   
   if (strcmp(data_send, data_recv)) {
     fprintf(stderr, "===[CLIENT]=== String sent != string received\n");
@@ -43,6 +42,6 @@ int main(int argc,char *argv[]) {
   fprintf(stderr,"===[CLIENT]=== Exiting successfully\n");
   gras_socket_close(sock);
    
-  xbt_exit();
+  gras_exit();
   return 0;
 }