Do not use neither type parsing nor the mixed sequence (nb 5), since both of them...

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

diff --git a/testsuite/gras/gs_example_receive.c b/testsuite/gras/gs_example_receive.c
index a510cd1..64d2bd1 100644 (file)
--- a/testsuite/gras/gs_example_receive.c
+++ b/testsuite/gras/gs_example_receive.c
@@ -53,7 +53,7 @@ main(int argc, char **argv) {
         int                             *array         = NULL;
         struct s_pair                    *p_pair        = NULL;
         char                            *str           = NULL;
         int                             *array         = NULL;
         struct s_pair                    *p_pair        = NULL;
         char                            *str           = NULL;

-        struct s_mixed                   *mixed         = NULL;
+       //        struct s_mixed                   *mixed         = NULL;

 
         struct s_gs_type_driver                 *t_driver      = NULL;
         struct s_gs_net_driver          *n_driver      = NULL;
 
         struct s_gs_type_driver                 *t_driver      = NULL;
         struct s_gs_net_driver          *n_driver      = NULL;


@@ -156,11 +156,12 @@ main(int argc, char **argv) {
         str = gs_message_receive_next_sequence(mi);
         printf("str = %s\n", str);
 
         str = gs_message_receive_next_sequence(mi);
         printf("str = %s\n", str);
 

+       /*

         fprintf(stderr, "\nreceiving sequence 5\n----------------\n");
         mixed = gs_message_receive_next_sequence(mi);
         printf("c1=%c c2=%c; l1=%ld l2=%ld\n", 
               mixed->c1, mixed->c2, mixed->l1, mixed->l2);
         fprintf(stderr, "\nreceiving sequence 5\n----------------\n");
         mixed = gs_message_receive_next_sequence(mi);
         printf("c1=%c c2=%c; l1=%ld l2=%ld\n", 
               mixed->c1, mixed->c2, mixed->l1, mixed->l2);

-
+       */

         gs_exit();
 
         return 0;
         gs_exit();
 
         return 0;

diff --git a/testsuite/gras/gs_example_send.c b/testsuite/gras/gs_example_send.c
index 54ff8a6..9ec9bfe 100644 (file)
--- a/testsuite/gras/gs_example_send.c
+++ b/testsuite/gras/gs_example_send.c
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <gras.h>
 
 #include <string.h>
 #include <gras.h>
 

-//#define PARSING
+#undef PARSING

 
 /* structs */
 struct list {
 
 /* structs */
 struct list {


@@ -61,6 +61,8 @@ string_size_callback(void             *vars,
         return 1+(long int)strlen(data);
 }
 
         return 1+(long int)strlen(data);
 }
 

+void parse_log_opt(int argc, char **argv,const char *deft);
+

 /* main */
 int
 main(int argc, char **argv) {
 /* main */
 int
 main(int argc, char **argv) {


@@ -72,12 +74,12 @@ main(int argc, char **argv) {
                 {
                         11, 12, 13, 14, 15,
                 };
                 {
                         11, 12, 13, 14, 15,
                 };

-   
+       /*

         struct s_mixed                mixed =
                 {
                        'a',1.0,'b',2.0
                };
         struct s_mixed                mixed =
                 {
                        'a',1.0,'b',2.0
                };

-
+       */

         struct s_gs_type_driver                *t_driver     = NULL;
         struct s_gs_net_driver         *n_driver     = NULL;
         struct s_gs_type_bag           *bag          = NULL;
         struct s_gs_type_driver                *t_driver     = NULL;
         struct s_gs_net_driver         *n_driver     = NULL;
         struct s_gs_type_bag           *bag          = NULL;


@@ -108,6 +110,7 @@ main(int argc, char **argv) {
         struct s_gs_message_instance   *mi           = NULL;
 
 
         struct s_gs_message_instance   *mi           = NULL;
 
 

+       parse_log_opt(argc,argv,"datadesc.thresh=debug");

         gs_init(argc, argv);
         gs_purge_cmd_line(&argc, argv);
        gras_log_control_set("NDR.thresh=debug");
         gs_init(argc, argv);
         gs_purge_cmd_line(&argc, argv);
        gras_log_control_set("NDR.thresh=debug");


@@ -188,9 +191,10 @@ main(int argc, char **argv) {
         gs_message_send_next_sequence(mi, &pair);
         fprintf(stderr, "\nsending sequence 4\n----------------\n");
         gs_message_send_next_sequence(mi, (void*)"Hello, World");
         gs_message_send_next_sequence(mi, &pair);
         fprintf(stderr, "\nsending sequence 4\n----------------\n");
         gs_message_send_next_sequence(mi, (void*)"Hello, World");

+       /*

         fprintf(stderr, "\nsending sequence 5\n----------------\n");
         gs_message_send_next_sequence(mi, (void*)&mixed);
         fprintf(stderr, "\nsending sequence 5\n----------------\n");
         gs_message_send_next_sequence(mi, (void*)&mixed);

-
+       */

         gs_exit();
 
         return 0;
         gs_exit();
 
         return 0;