test local version of gras, not the installed one; use gras_init now that it exists...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@605 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/testsuite/gras/mk_datadesc_structs.pl b/testsuite/gras/mk_datadesc_structs.pl
index 7ebf03c82a60c24cb521c5a79c4764e85a6ee6fd..41a65715daaedd3838e7e1128389a8cfcb3dd1f5 100755 (executable)
--- a/testsuite/gras/mk_datadesc_structs.pl
+++ b/testsuite/gras/mk_datadesc_structs.pl
@@ -19,8 +19,7 @@ die 'scalar @types != scalar @abrev' unless (scalar @types == scalar @abrev);
 
 print "/* This file is perl-generated, of course */\n\n";
 
-print "#include <stdio.h>\n";
-print "#include <gras.h>\n\n";
+print "#include \"gras.h\"\n\n";
 
 print "XBT_LOG_NEW_DEFAULT_SUBCATEGORY(structs,test,\"Logs about the gigantic struct test\");\n\n";
 

diff --git a/testsuite/gras/trp_file_client.c b/testsuite/gras/trp_file_client.c
index 6d4b89504e5e30017030fb44a061e43525991060..8985f922fcb19d4a886190cfd3aead585f1b366a 100644 (file)
--- a/testsuite/gras/trp_file_client.c
+++ b/testsuite/gras/trp_file_client.c
@@ -2,13 +2,13 @@
 
 /* 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); */
@@ -19,7 +19,7 @@ int main(int argc,char *argv[]) {
   char data_send[256];
 
   memset(data_send,0,sizeof(data_send));
-  xbt_init_defaultlog(&argc,argv,"trp.thresh=debug");
+  gras_init(&argc,argv,"trp.thresh=debug");
 
   fprintf(stderr,"===[CLIENT]=== Contact the server\n");
   TRYFAIL(gras_socket_client_from_file("-",&sock));

diff --git a/testsuite/gras/trp_file_server.c b/testsuite/gras/trp_file_server.c
index c38b6e671f3ddd0ed408444d373a6eb874c16a29..cbe4e5527a304d50be23489d6a4ecf66e8ae88b3 100644 (file)
--- a/testsuite/gras/trp_file_server.c
+++ b/testsuite/gras/trp_file_server.c
@@ -2,13 +2,13 @@
 
 /* trp_tcp_server: Server 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);*/
@@ -18,7 +18,7 @@ int main(int argc,char *argv[]) {
   xbt_error_t errcode;
   char data_recv[256];
 
-  xbt_init_defaultlog(&argc,argv,"trp.thresh=debug");
+  gras_init(&argc,argv,"trp.thresh=debug");
 
   fprintf(stderr,"===[SERVER]=== Create the socket\n");
   TRYFAIL(gras_socket_server_from_file("-",&sock));

diff --git a/testsuite/gras/trp_tcp_client.c b/testsuite/gras/trp_tcp_client.c
index c21c1b6fbc3fb77617e3b633f6584a4e9a5892bc..f12fe7668029f35afcd0704c3f1c5eeea595e836 100644 (file)
--- a/testsuite/gras/trp_tcp_client.c
+++ b/testsuite/gras/trp_tcp_client.c
@@ -2,13 +2,13 @@
 
 /* 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);*/
@@ -22,7 +22,7 @@ int main(int argc,char *argv[]) {
   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,"trp.thresh=debug");
 
   fprintf(stderr,"===[CLIENT]=== Contact the server\n");
   TRYFAIL(gras_socket_client(NULL,55555,&sock));

diff --git a/testsuite/gras/trp_tcp_server.c b/testsuite/gras/trp_tcp_server.c
index 1623608a5bb5735cc89772f789a31ab478d6fb63..46e76c5cd3e0267d564bc76e77d609e0c9c1651a 100644 (file)
--- a/testsuite/gras/trp_tcp_server.c
+++ b/testsuite/gras/trp_tcp_server.c
@@ -2,13 +2,13 @@
 
 /* trp_tcp_server: Server 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);*/
@@ -18,7 +18,7 @@ int main(int argc,char *argv[]) {
   xbt_error_t errcode;
   char data_recv[256];
 
-  xbt_init_defaultlog(&argc,argv,"trp.thresh=debug");
+  gras_init(&argc,argv,"trp.thresh=debug");
 
   fprintf(stderr,"===[SERVER]=== Create the socket\n");
   TRYFAIL(gras_socket_server(55555,&sock));