From 52be8c81d55b81b23315d914e4d35da201282ff4 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 19 Jul 2011 11:09:39 +0200 Subject: [PATCH] Cosmetics: structs have 4 fields. --- teshsuite/gras/datadesc/datadesc_mem.tesh | 2 +- teshsuite/gras/datadesc/datadesc_r_big32_8_4.tesh | 2 +- teshsuite/gras/datadesc/datadesc_r_little32_4.tesh | 2 +- teshsuite/gras/datadesc/datadesc_r_little64.tesh | 2 +- teshsuite/gras/datadesc/datadesc_rw.tesh | 4 ++-- teshsuite/gras/datadesc/datadesc_structs.c | 2 +- teshsuite/gras/datadesc/mk_datadesc_structs.pl | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/teshsuite/gras/datadesc/datadesc_mem.tesh b/teshsuite/gras/datadesc/datadesc_mem.tesh index a49e13e161..7ba1b77dbe 100644 --- 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 2d11d91886..94ae55ee1c 100644 --- 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 00e76fb5ce..bbed12263b 100644 --- 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 3c61b65ad0..cf5babc969 100644 --- 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 d13f672abe..1769849e7c 100644 --- 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 8ad25f704b..57fb7e1832 100644 --- 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 5c9a121b0b..a8c22b1943 100755 --- 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"; -- 2.20.1