Cosmetics: structs have 4 fields.

diff --git a/teshsuite/gras/datadesc/datadesc_mem.tesh b/teshsuite/gras/datadesc/datadesc_mem.tesh
index a49e13e..7ba1b77 100644 (file)
--- a/teshsuite/gras/datadesc/datadesc_mem.tesh
+++ b/teshsuite/gras/datadesc/datadesc_mem.tesh
@@ -10,7 +10,7 @@ $ gras/datadesc/datadesc_usage --copy "--log=root.fmt:%m%n"
 > ---- Test on string (ref to dynamic array) ----
 > ---- Test on dynar containing integers ----
 > ---- Test on empty dynar of integers ----
-> ---- Test on all possible struct having 3 fields (49 structs) ----
+> ---- Test on all possible struct having 4 fields (49 structs) ----
 > ---- Test on homogeneous structure ----
 > ---- Test on heterogeneous structure ----
 > ---- Test on nested structures ----

diff --git a/teshsuite/gras/datadesc/datadesc_r_big32_8_4.tesh b/teshsuite/gras/datadesc/datadesc_r_big32_8_4.tesh
index 2d11d91..94ae55e 100644 (file)
--- a/teshsuite/gras/datadesc/datadesc_r_big32_8_4.tesh
+++ b/teshsuite/gras/datadesc/datadesc_r_big32_8_4.tesh
@@ -11,7 +11,7 @@ $ gras/datadesc/datadesc_usage --read ${srcdir:=.}/gras/datadesc/datadesc.big32_
 > ---- Test on string (ref to dynamic array) ----
 > ---- Test on dynar containing integers ----
 > ---- Test on empty dynar of integers ----
-> ---- Test on all possible struct having 3 fields (49 structs) ----
+> ---- Test on all possible struct having 4 fields (49 structs) ----
 > ---- Test on homogeneous structure ----
 > ---- Test on heterogeneous structure ----
 > ---- Test on nested structures ----

diff --git a/teshsuite/gras/datadesc/datadesc_r_little32_4.tesh b/teshsuite/gras/datadesc/datadesc_r_little32_4.tesh
index 00e76fb..bbed122 100644 (file)
--- a/teshsuite/gras/datadesc/datadesc_r_little32_4.tesh
+++ b/teshsuite/gras/datadesc/datadesc_r_little32_4.tesh
@@ -11,7 +11,7 @@ $ gras/datadesc/datadesc_usage --read ${srcdir:=.}/gras/datadesc/datadesc.little
 > ---- Test on string (ref to dynamic array) ----
 > ---- Test on dynar containing integers ----
 > ---- Test on empty dynar of integers ----
-> ---- Test on all possible struct having 3 fields (49 structs) ----
+> ---- Test on all possible struct having 4 fields (49 structs) ----
 > ---- Test on homogeneous structure ----
 > ---- Test on heterogeneous structure ----
 > ---- Test on nested structures ----

diff --git a/teshsuite/gras/datadesc/datadesc_r_little64.tesh b/teshsuite/gras/datadesc/datadesc_r_little64.tesh
index 3c61b65..cf5babc 100644 (file)
--- a/teshsuite/gras/datadesc/datadesc_r_little64.tesh
+++ b/teshsuite/gras/datadesc/datadesc_r_little64.tesh
@@ -11,7 +11,7 @@ $ $SG_TEST_EXENV gras/datadesc/datadesc_usage --read ${srcdir:=.}/gras/datadesc/
 > ---- Test on string (ref to dynamic array) ----
 > ---- Test on dynar containing integers ----
 > ---- Test on empty dynar of integers ----
-> ---- Test on all possible struct having 3 fields (49 structs) ----
+> ---- Test on all possible struct having 4 fields (49 structs) ----
 > ---- Test on homogeneous structure ----
 > ---- Test on heterogeneous structure ----
 > ---- Test on nested structures ----

diff --git a/teshsuite/gras/datadesc/datadesc_rw.tesh b/teshsuite/gras/datadesc/datadesc_rw.tesh
index d13f672..1769849 100644 (file)
--- a/teshsuite/gras/datadesc/datadesc_rw.tesh
+++ b/teshsuite/gras/datadesc/datadesc_rw.tesh
@@ -12,7 +12,7 @@ $ gras/datadesc/datadesc_usage --write "--log=root.fmt:%m%n"
 > ---- Test on string (ref to dynamic array) ----
 > ---- Test on dynar containing integers ----
 > ---- Test on empty dynar of integers ----
-> ---- Test on all possible struct having 3 fields (49 structs) ----
+> ---- Test on all possible struct having 4 fields (49 structs) ----
 > ---- Test on homogeneous structure ----
 > ---- Test on heterogeneous structure ----
 > ---- Test on nested structures ----
@@ -35,7 +35,7 @@ $ gras/datadesc/datadesc_usage --read "--log=root.fmt:%m%n"
 > ---- Test on string (ref to dynamic array) ----
 > ---- Test on dynar containing integers ----
 > ---- Test on empty dynar of integers ----
-> ---- Test on all possible struct having 3 fields (49 structs) ----
+> ---- Test on all possible struct having 4 fields (49 structs) ----
 > ---- Test on homogeneous structure ----
 > ---- Test on heterogeneous structure ----
 > ---- Test on nested structures ----

diff --git a/teshsuite/gras/datadesc/datadesc_structs.c b/teshsuite/gras/datadesc/datadesc_structs.c
index 8ad25f7..57fb7e1 100644 (file)
--- a/teshsuite/gras/datadesc/datadesc_structs.c
+++ b/teshsuite/gras/datadesc/datadesc_structs.c
@@ -610,7 +610,7 @@ void test_structures(gras_socket_t * sock, int direction)
       { 1424420.11331 + (double) 1, 'w' + (char) 2,
 1424420.11331 + (double) 3, 'w' + (char) 4 }, my_dcdc2;
   XBT_INFO
-      ("---- Test on all possible struct having 3 fields (49 structs) ----");
+      ("---- Test on all possible struct having 4 fields (49 structs) ----");
   write_read("cccc", &my_cccc, &my_cccc2, sock, direction);
   if (direction == READ || direction == RW) {
     int failed = 0;

diff --git a/teshsuite/gras/datadesc/mk_datadesc_structs.pl b/teshsuite/gras/datadesc/mk_datadesc_structs.pl
index 5c9a121..a8c22b1 100755 (executable)
--- a/teshsuite/gras/datadesc/mk_datadesc_structs.pl
+++ b/teshsuite/gras/datadesc/mk_datadesc_structs.pl
@@ -66,7 +66,7 @@ for $i (0..$max_i) { for $j (0..$max_j) { for $k (0..$max_k) { for $l (0..$max_l
                                            .$val[$l]."+(".$types[$l].")4}, my_${struct}2;\n";
 }}}}
 
-print "  XBT_INFO(\"---- Test on all possible struct having 3 fields (".(($max_i+1)*($max_j+1)*($max_k+1)*($max_l+1))." structs) ----\");\n";
+print "  XBT_INFO(\"---- Test on all possible struct having 4 fields (".(($max_i+1)*($max_j+1)*($max_k+1)*($max_l+1))." structs) ----\");\n";
 for $i (0..$max_i) { for $j (0..$max_j) { for $k (0..$max_k) { for $l (0..$max_l) {
     my $struct=$abrev[$i].$abrev[$j].$abrev[$k].$abrev[$l];
     print "  write_read(\"$struct\", &my_$struct, &my_${struct}2, sock,direction);\n";