A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make things work on allo-psmn. It's just a workaround. I let you make a "clean" ...
[simgrid.git]
/
testsuite
/
gras
/
datadesc_usage.c
diff --git
a/testsuite/gras/datadesc_usage.c
b/testsuite/gras/datadesc_usage.c
index
f715163
..
813a605
100644
(file)
--- a/
testsuite/gras/datadesc_usage.c
+++ b/
testsuite/gras/datadesc_usage.c
@@
-2,14
+2,13
@@
/* datadesc: test of data description (using file transport). */
/* datadesc: test of data description (using file transport). */
-/* Authors: Martin Quinson */
-/* Copyright (C) 2004 the OURAGAN project. */
+/* Copyright (c) 2004 Martin Quinson. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
/* This program is free software; you can redistribute it and/or modify it
-
under the terms of the license (GNU LGPL) which comes with this package. */
+
*
under the terms of the license (GNU LGPL) which comes with this package. */
#include <stdio.h>
#include <stdio.h>
-#include
<gras.h>
+#include
"gras.h"
#include "gras/DataDesc/datadesc_interface.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(test,"Logging specific to this test");
#include "gras/DataDesc/datadesc_interface.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(test,"Logging specific to this test");
@@
-35,6
+34,7
@@
write_read(gras_datadesc_type_t type,void *src, void *dst,
TRY(gras_socket_client_from_file(filename,&sock));
if (direction == WRITE || direction == RW)
TRY(gras_datadesc_send(sock, type, src));
TRY(gras_socket_client_from_file(filename,&sock));
if (direction == WRITE || direction == RW)
TRY(gras_datadesc_send(sock, type, src));
+// TRY(gras_datadesc_gen_send(sock, type, src));
if (direction == RW)
gras_socket_close(sock);
if (direction == RW)
gras_socket_close(sock);
@@
-485,7
+485,9
@@
xbt_error_t test_pbio(gras_socket_t sock, int direction) {
/* Check that the data match */
xbt_assert(i.Cnstatv == j.Cnstatv);
for (cpt=0; cpt<12; cpt++)
/* Check that the data match */
xbt_assert(i.Cnstatv == j.Cnstatv);
for (cpt=0; cpt<12; cpt++)
- xbt_assert(i.Cstatev[cpt] == j.Cstatev[cpt]);
+ xbt_assert4(i.Cstatev[cpt] == j.Cstatev[cpt],
+ "i.Cstatev[%d] (=%f) != j.Cstatev[%d] (=%f)",
+ cpt,i.Cstatev[cpt],cpt,j.Cstatev[cpt]);
xbt_assert(i.Cnprops == j.Cnprops);
for (cpt=0; cpt<110; cpt++)
xbt_assert(i.Cprops[cpt] == j.Cprops[cpt]);
xbt_assert(i.Cnprops == j.Cnprops);
for (cpt=0; cpt<110; cpt++)
xbt_assert(i.Cprops[cpt] == j.Cprops[cpt]);
@@
-567,7
+569,7
@@
int main(int argc,char *argv[]) {
int cpt;
char r_arch_char = gras_arch_selfid();
int cpt;
char r_arch_char = gras_arch_selfid();
-
xbt_init_defaultlog
(&argc,argv,NULL);
+
gras_init
(&argc,argv,NULL);
for (cpt=1; cpt<argc; cpt++) {
if (!strcmp(argv[cpt], "--read")) {
for (cpt=1; cpt<argc; cpt++) {
if (!strcmp(argv[cpt], "--read")) {
@@
-618,7
+620,7
@@
int main(int argc,char *argv[]) {
if (direction != RW)
gras_socket_close(sock);
if (direction != RW)
gras_socket_close(sock);
-
xbt
_exit();
+
gras
_exit();
return 0;
}
return 0;
}