X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7e482cb1ef697b23d6ebe5c6d3849e4f48f0c49b..1be63131cd544fd1e142525439c89b7140509bd3:/testsuite/gras/mk_datadesc_structs.pl

diff --git a/testsuite/gras/mk_datadesc_structs.pl b/testsuite/gras/mk_datadesc_structs.pl
index b3d15eb4ba..8e62de0362 100755
--- a/testsuite/gras/mk_datadesc_structs.pl
+++ b/testsuite/gras/mk_datadesc_structs.pl
@@ -26,7 +26,7 @@ print "XBT_LOG_NEW_DEFAULT_SUBCATEGORY(structs,test,\"Logs about the gigantic st
 print "#define READ  0\n#define WRITE 1\n#define RW    2\n\n";
   
 
-print "xbt_error_t write_read(gras_datadesc_type_t type,void *src, void *dst, gras_socket_t *sock, int direction);\n\n";
+print "void write_read(gras_datadesc_type_t type,void *src, void *dst, gras_socket_t *sock, int direction);\n\n";
 
 my ($i,$j,$k,$l);
 my $max=scalar @types;
@@ -49,9 +49,8 @@ for $i (0..$max_i) { for $j (0..$max_j) { for $k (0..$max_k) { for $l (0..$max_l
 # print "\n#define test(a) do {if (!(a)) { failed = 1; ERROR1(\"%s failed\",#a);}} while (0)\n";
  print "\n#define test(a) xbt_assert(a)\n";
 
-print "\nxbt_error_t test_structures(gras_socket_t *sock, int direction);\n";
-print "\nxbt_error_t test_structures(gras_socket_t *sock, int direction) {\n";
-print "  xbt_error_t errcode;\n";
+print "void test_structures(gras_socket_t *sock, int direction);\n";
+print "void test_structures(gras_socket_t *sock, int direction) {\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 "  struct $struct my_$struct = {".$val[$i]."+(".$types[$i].")1,"
@@ -60,10 +59,10 @@ 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 "  INFO0(\"---- Test on all possible struct having 3 fields (".($max_i*$max_j*$max_k*($max_l+1))." structs) ----\");\n";
+print "  INFO0(\"---- Test on all possible struct having 3 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 "  TRY(write_read(gras_datadesc_by_symbol($struct), &my_$struct, &my_${struct}2, sock,direction));\n";
+    print "  write_read(gras_datadesc_by_symbol($struct), &my_$struct, &my_${struct}2, sock,direction);\n";
     print "  if (direction == READ || direction == RW) {\n";
     print "     int failed = 0;\n";
     print "     test(my_$struct.a == my_${struct}2.a);\n";
@@ -73,6 +72,5 @@ for $i (0..$max_i) { for $j (0..$max_j) { for $k (0..$max_k) { for $l (0..$max_l
     print "     if (!failed) VERB0(\"Passed $struct\");\n";
     print "  }\n";
 }}}}
-    print "  return no_error;\n";
     print "}\n";
     ;