Stupid me. Using rand to generate the datatest is not very wise...

[simgrid.git] / testsuite / gras / datadesc_usage.c

diff --git a/testsuite/gras/datadesc_usage.c b/testsuite/gras/datadesc_usage.c
index e25b677..ce359af 100644 (file)
--- a/testsuite/gras/datadesc_usage.c
+++ b/testsuite/gras/datadesc_usage.c
@@ -19,7 +19,7 @@ GRAS_LOG_NEW_DEFAULT_CATEGORY(test);
 #define RW    2
 
 int r_arch;
-  
+const char *filename = "datadesc_usage.out";  
 
 gras_error_t
 write_read(gras_datadesc_type_t *type,void *src, void *dst, 
@@ -32,7 +32,7 @@ write_read(gras_datadesc_type_t *type,void *src, void *dst,
    
   /* write */
   if (direction == RW) 
-    TRY(gras_socket_client_from_file("datadesc_usage.out",&sock));
+    TRY(gras_socket_client_from_file(filename,&sock));
   if (direction == WRITE || direction == RW)
     TRY(gras_datadesc_send(sock, type, src));
   if (direction == RW) 
@@ -40,7 +40,7 @@ write_read(gras_datadesc_type_t *type,void *src, void *dst,
    
   /* read */
   if (direction == RW) 
-    TRY(gras_socket_server_from_file("datadesc_usage.out",&sock));
+    TRY(gras_socket_server_from_file(filename,&sock));
 
   if (direction == READ || direction == RW)
     TRY(gras_datadesc_recv(sock, type, r_arch, dst));
@@ -92,13 +92,11 @@ gras_error_t test_array(gras_socket_t *sock, int direction) {
   gras_error_t errcode;
   gras_datadesc_type_t *my_type;
   
-  array i,j;
+  array i = { 35212,-6226,74337,11414,7733};
+  array j;
   int cpt;
 
   INFO0("==== Test on fixed array ====");
-  for (cpt=0; cpt<SIZE; cpt++) {
-    i[cpt] = rand();
-  }
 
   TRY(gras_datadesc_declare_array_fixed("fixed int array", 
                                        gras_datadesc_by_name("int"),
@@ -106,9 +104,11 @@ gras_error_t test_array(gras_socket_t *sock, int direction) {
 
   TRY(write_read(my_type, &i,&j, sock,direction));
   if (direction == READ || direction == RW) {
-    for (cpt=0; cpt<SIZE; cpt++)
+    for (cpt=0; cpt<SIZE; cpt++) {
+      DEBUG1("Test spot %d",cpt);
       gras_assert4(i[cpt] == j[cpt],"i[%d]=%d  !=  j[%d]=%d",
                   cpt,i[cpt],cpt,j[cpt]);
+    }
   }
   return no_error;
 }
@@ -186,8 +186,8 @@ gras_error_t test_homostruct(gras_socket_t *sock, int direction) {
   /* init a value, exchange it and check its validity*/
   if (! (i=malloc(sizeof(homostruct))) )
     RAISE_MALLOC;
-  i->a = rand();  i->b = rand();
-  i->c = rand();  i->d = rand();
+  i->a = 2235;    i->b = 433425;
+  i->c = -23423;  i->d = -235235;
 
   TRY(write_read(my_type, &i,&j, sock,direction));
   if (direction == READ || direction == RW) {
@@ -275,8 +275,8 @@ gras_error_t test_nestedstruct(gras_socket_t *sock, int direction) {
   /* init a value, exchange it and check its validity*/
   if (! (i=malloc(sizeof(nestedstruct))) )
     RAISE_MALLOC;
-  i->homo.a = rand();  i->homo.b = rand();
-  i->homo.c = rand();  i->homo.d = rand();
+  i->homo.a = 235231;  i->homo.b = -124151;
+  i->homo.c = 211551;  i->homo.d = -664222;
   i->hete.c1 = 's'; i->hete.l1 = 123455;
   i->hete.c2 = 'e'; i->hete.l2 = 774531;
 
@@ -350,7 +350,7 @@ gras_error_t test_chain_list(gras_socket_t *sock, int direction) {
   INFO0("==== Test on chained list ====");
 
   /* init a value, exchange it and check its validity*/
-  i = cons( rand(), cons( rand() , cons( rand(), NULL)));
+  i = cons( 12355, cons( 246264 , cons( 23263, NULL)));
   j = NULL;
 
   TRY(write_read(gras_datadesc_by_name("chained_list_t*"),
@@ -373,7 +373,7 @@ gras_error_t test_graph(gras_socket_t *sock, int direction) {
 
   INFO0("==== Test on graph (cyclique chained list) ====");
   /* init a value, exchange it and check its validity*/
-  i = cons( rand(), cons( rand() , cons( rand(), NULL)));
+  i = cons( 1151515, cons( -232362 , cons( 222552, NULL)));
   i->l->l->l = i;
   j = NULL;
 
@@ -421,31 +421,33 @@ int main(int argc,char *argv[]) {
   gras_error_t errcode;
   gras_socket_t *sock;
   int direction = RW;
+  int cpt;
   char r_arch_char = gras_arch_selfid();
 
-  gras_init_defaultlog(&argc,argv,
-                      "DataDesc.thresh=verbose"
-                      " test.thresh=debug"
-                      //" set.thresh=debug"
-                      );
-  if (argc >= 2) {
-    if (!strcmp(argv[1], "--read"))
+  gras_init_defaultlog(&argc,argv,NULL);
+
+  for (cpt=1; cpt<argc; cpt++) {
+    if (!strcmp(argv[cpt], "--read")) {
       direction = READ;
-    if (!strcmp(argv[1], "--write"))
+    } else if (!strcmp(argv[cpt], "--write")) {
       direction = WRITE;
+    } else {
+       filename=argv[cpt];
+    }
   }
     
   if (direction == WRITE) {
-    TRYFAIL(gras_socket_client_from_file("datadesc_usage.out",&sock));
+    TRYFAIL(gras_socket_client_from_file(filename,&sock));
     TRY(gras_datadesc_send(sock, gras_datadesc_by_name("char"),
                           &r_arch_char));
   }
   if (direction == READ) {
-    TRYFAIL(gras_socket_server_from_file("datadesc_usage.out",&sock));
+    TRYFAIL(gras_socket_server_from_file(filename,&sock));
     TRY(gras_datadesc_recv(sock, gras_datadesc_by_name("char"),
                           gras_arch_selfid(), &r_arch_char));
-    INFO1("This datafile was generated on %s", 
-         gras_datadesc_arch_name(r_arch_char));
+    INFO3("This datafile was generated on %s (%d), I'm %s.",
+         gras_datadesc_arch_name(r_arch_char),(int)r_arch_char,
+         gras_datadesc_arch_name(gras_arch_selfid()));
   }
   r_arch = (int)r_arch_char;