From 3d462afa403565dd50d8b96bb96300e3bc7eed87 Mon Sep 17 00:00:00 2001
From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 12 Sep 2007 14:28:40 +0000
Subject: [PATCH] Move GRAS tests to TESH

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4591 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 teshsuite/Makefile.am                         |  52 +-
 teshsuite/Makefile.in                         | 180 +++++-
 {testsuite => teshsuite}/gras/datadesc.big32  | Bin
 .../gras/datadesc.big32_2                     | Bin
 .../gras/datadesc.big32_8_4                   | Bin
 {testsuite => teshsuite}/gras/datadesc.big64  | Bin
 .../gras/datadesc.little32                    | Bin
 .../gras/datadesc.little32_4                  | Bin
 .../gras/datadesc.little64                    | Bin
 teshsuite/gras/datadesc_mem.tesh              |  20 +
 teshsuite/gras/datadesc_r_little32.tesh       |  21 +
 teshsuite/gras/datadesc_r_little32_4.tesh     |  21 +
 teshsuite/gras/datadesc_r_little64.tesh       |  21 +
 teshsuite/gras/datadesc_rw.tesh               |  20 +
 teshsuite/gras/datadesc_structs.c             | 557 ++++++++++++++++++
 .../gras/datadesc_usage.c                     |   0
 .../gras/mk_datadesc_structs.pl               |   0
 teshsuite/gras/trp_file_client                | 136 +++++
 .../gras/trp_file_client.c                    |   0
 .../gras/trp_file_server.c                    |   0
 .../gras/trp_file_usage.in                    |   0
 teshsuite/gras/trp_file_usage.tesh            |   8 +
 .../gras/trp_tcp_client.c                     |   0
 .../gras/trp_tcp_server.c                     |   0
 teshsuite/gras/trp_tcp_usage                  |  18 +
 .../gras/trp_tcp_usage.in                     |   0
 teshsuite/gras/trp_tcp_usage.tesh             |   8 +
 testsuite/Makefile.am                         |  31 +-
 testsuite/Makefile.in                         | 185 +-----
 testsuite/run_tests.in                        |  17 +-
 30 files changed, 1066 insertions(+), 229 deletions(-)
 rename {testsuite => teshsuite}/gras/datadesc.big32 (100%)
 rename {testsuite => teshsuite}/gras/datadesc.big32_2 (100%)
 rename {testsuite => teshsuite}/gras/datadesc.big32_8_4 (100%)
 rename {testsuite => teshsuite}/gras/datadesc.big64 (100%)
 rename {testsuite => teshsuite}/gras/datadesc.little32 (100%)
 rename {testsuite => teshsuite}/gras/datadesc.little32_4 (100%)
 rename {testsuite => teshsuite}/gras/datadesc.little64 (100%)
 create mode 100644 teshsuite/gras/datadesc_mem.tesh
 create mode 100644 teshsuite/gras/datadesc_r_little32.tesh
 create mode 100644 teshsuite/gras/datadesc_r_little32_4.tesh
 create mode 100644 teshsuite/gras/datadesc_r_little64.tesh
 create mode 100644 teshsuite/gras/datadesc_rw.tesh
 create mode 100644 teshsuite/gras/datadesc_structs.c
 rename {testsuite => teshsuite}/gras/datadesc_usage.c (100%)
 rename {testsuite => teshsuite}/gras/mk_datadesc_structs.pl (100%)
 create mode 100755 teshsuite/gras/trp_file_client
 rename {testsuite => teshsuite}/gras/trp_file_client.c (100%)
 rename {testsuite => teshsuite}/gras/trp_file_server.c (100%)
 rename {testsuite => teshsuite}/gras/trp_file_usage.in (100%)
 create mode 100644 teshsuite/gras/trp_file_usage.tesh
 rename {testsuite => teshsuite}/gras/trp_tcp_client.c (100%)
 rename {testsuite => teshsuite}/gras/trp_tcp_server.c (100%)
 create mode 100755 teshsuite/gras/trp_tcp_usage
 rename {testsuite => teshsuite}/gras/trp_tcp_usage.in (100%)
 create mode 100644 teshsuite/gras/trp_tcp_usage.tesh

diff --git a/teshsuite/Makefile.am b/teshsuite/Makefile.am
index 3deaa3c0b4..bddf4e4eff 100644
--- a/teshsuite/Makefile.am
+++ b/teshsuite/Makefile.am
@@ -1,15 +1,57 @@
-INCLUDES  = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include
 AM_CFLAGS = -g
 
 
-TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh
+CLEANFILES = gras/datadesc_usage.out datadesc_usage.out
+EXTRA_DIST=run_tests.in \
+  gras/datadesc.little32 gras/datadesc.little32_4 \
+  gras/datadesc.little64\
+  gras/datadesc.big32 gras/datadesc.big32_8_4 gras/datadesc.big32_2 \
+  gras/mk_datadesc_structs.pl
+  
 
+TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh
+TESTS = xbt/parallel_log_crashtest.tesh     \
+	gras/trp_tcp_usage.tesh             \
+	gras/trp_file_usage.tesh            \
+	gras/datadesc_mem.tesh          \
+	gras/datadesc_rw.tesh           \
+	gras/datadesc_r_little32.tesh   \
+	gras/datadesc_r_little32_4.tesh \
+	gras/datadesc_r_little64.tesh   
+	
+# Data sets still to regenerate:
+#	gras/datadesc_usage_little32_4.tesh 
+#           gras/datadesc_usage --read ./gras/datadesc.big32;     \
+#           gras/datadesc_usage --read ./gras/datadesc.big32_8_4; \
+#           gras/datadesc_usage --read ./gras/datadesc.big32_2;
 
-TESTS = xbt/parallel_log_crashtest.tesh 
 
-noinst_PROGRAMS =xbt/parallel_log_crashtest
+noinst_PROGRAMS = \
+       xbt/parallel_log_crashtest \
+       \
+       gras/trp_tcp_client   gras/trp_tcp_server   \
+       gras/trp_file_client  gras/trp_file_server  \
+       gras/datadesc_usage   
+			       
+LDADD_SG=$(abs_top_builddir)/src/libsimgrid.la
+LDADD_RL=$(abs_top_builddir)/src/libgras.la
 
 # Try parallel logs 
-xbt_parallel_log_crashtest_LDADD = $(top_builddir)/src/libgras.la
+xbt_parallel_log_crashtest_LDADD = $(LDADD_RL)
+
+# Try raw communication facilities
+gras_trp_tcp_client_LDADD=     $(LDADD_RL)
+gras_trp_tcp_server_LDADD=     $(LDADD_RL)
+gras_trp_file_client_LDADD=    $(LDADD_RL)
+gras_trp_file_server_LDADD=    $(LDADD_RL)
+
+# Try structured communication facilities
+gras_datadesc_usage_SOURCES=   gras/datadesc_usage.c gras/datadesc_structs.c
+gras_datadesc_usage_LDADD=     $(LDADD_RL)
+
+gras/datadesc_structs.c: gras/mk_datadesc_structs.pl
+	cd gras ; perl ../$(top_srcdir)/teshsuite/gras/mk_datadesc_structs.pl > datadesc_structs.c
+
 
 include $(top_srcdir)/acmacro/dist-files.mk
diff --git a/teshsuite/Makefile.in b/teshsuite/Makefile.in
index 3c095bdeec..77ebe744c0 100644
--- a/teshsuite/Makefile.in
+++ b/teshsuite/Makefile.in
@@ -38,7 +38,10 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-noinst_PROGRAMS = xbt/parallel_log_crashtest$(EXEEXT)
+noinst_PROGRAMS = xbt/parallel_log_crashtest$(EXEEXT) \
+	gras/trp_tcp_client$(EXEEXT) gras/trp_tcp_server$(EXEEXT) \
+	gras/trp_file_client$(EXEEXT) gras/trp_file_server$(EXEEXT) \
+	gras/datadesc_usage$(EXEEXT)
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/acmacro/dist-files.mk
 subdir = teshsuite
@@ -57,11 +60,26 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/gras_config.h
 CONFIG_CLEAN_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
+am_gras_datadesc_usage_OBJECTS = datadesc_usage.$(OBJEXT) \
+	datadesc_structs.$(OBJEXT)
+gras_datadesc_usage_OBJECTS = $(am_gras_datadesc_usage_OBJECTS)
+gras_datadesc_usage_DEPENDENCIES = $(LDADD_RL)
+am__dirstamp = $(am__leading_dot)dirstamp
+gras_trp_file_client_SOURCES = gras/trp_file_client.c
+gras_trp_file_client_OBJECTS = trp_file_client.$(OBJEXT)
+gras_trp_file_client_DEPENDENCIES = $(LDADD_RL)
+gras_trp_file_server_SOURCES = gras/trp_file_server.c
+gras_trp_file_server_OBJECTS = trp_file_server.$(OBJEXT)
+gras_trp_file_server_DEPENDENCIES = $(LDADD_RL)
+gras_trp_tcp_client_SOURCES = gras/trp_tcp_client.c
+gras_trp_tcp_client_OBJECTS = trp_tcp_client.$(OBJEXT)
+gras_trp_tcp_client_DEPENDENCIES = $(LDADD_RL)
+gras_trp_tcp_server_SOURCES = gras/trp_tcp_server.c
+gras_trp_tcp_server_OBJECTS = trp_tcp_server.$(OBJEXT)
+gras_trp_tcp_server_DEPENDENCIES = $(LDADD_RL)
 xbt_parallel_log_crashtest_SOURCES = xbt/parallel_log_crashtest.c
 xbt_parallel_log_crashtest_OBJECTS = parallel_log_crashtest.$(OBJEXT)
-xbt_parallel_log_crashtest_DEPENDENCIES =  \
-	$(top_builddir)/src/libgras.la
-am__dirstamp = $(am__leading_dot)dirstamp
+xbt_parallel_log_crashtest_DEPENDENCIES = $(LDADD_RL)
 DEFAULT_INCLUDES = -I. -I$(top_builddir)/src@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -74,8 +92,12 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = xbt/parallel_log_crashtest.c
-DIST_SOURCES = xbt/parallel_log_crashtest.c
+SOURCES = $(gras_datadesc_usage_SOURCES) gras/trp_file_client.c \
+	gras/trp_file_server.c gras/trp_tcp_client.c \
+	gras/trp_tcp_server.c xbt/parallel_log_crashtest.c
+DIST_SOURCES = $(gras_datadesc_usage_SOURCES) gras/trp_file_client.c \
+	gras/trp_file_server.c gras/trp_tcp_client.c \
+	gras/trp_tcp_server.c xbt/parallel_log_crashtest.c
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -214,13 +236,40 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include
 AM_CFLAGS = -g
+CLEANFILES = gras/datadesc_usage.out datadesc_usage.out
+EXTRA_DIST = run_tests.in \
+  gras/datadesc.little32 gras/datadesc.little32_4 \
+  gras/datadesc.little64\
+  gras/datadesc.big32 gras/datadesc.big32_8_4 gras/datadesc.big32_2 \
+  gras/mk_datadesc_structs.pl
+
 TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh
-TESTS = xbt/parallel_log_crashtest.tesh 
+TESTS = xbt/parallel_log_crashtest.tesh     \
+	gras/trp_tcp_usage.tesh             \
+	gras/trp_file_usage.tesh            \
+	gras/datadesc_mem.tesh          \
+	gras/datadesc_rw.tesh           \
+	gras/datadesc_r_little32.tesh   \
+	gras/datadesc_r_little32_4.tesh \
+	gras/datadesc_r_little64.tesh   
+
+LDADD_SG = $(abs_top_builddir)/src/libsimgrid.la
+LDADD_RL = $(abs_top_builddir)/src/libgras.la
 
 # Try parallel logs 
-xbt_parallel_log_crashtest_LDADD = $(top_builddir)/src/libgras.la
+xbt_parallel_log_crashtest_LDADD = $(LDADD_RL)
+
+# Try raw communication facilities
+gras_trp_tcp_client_LDADD = $(LDADD_RL)
+gras_trp_tcp_server_LDADD = $(LDADD_RL)
+gras_trp_file_client_LDADD = $(LDADD_RL)
+gras_trp_file_server_LDADD = $(LDADD_RL)
+
+# Try structured communication facilities
+gras_datadesc_usage_SOURCES = gras/datadesc_usage.c gras/datadesc_structs.c
+gras_datadesc_usage_LDADD = $(LDADD_RL)
 all: all-am
 
 .SUFFIXES:
@@ -261,6 +310,24 @@ clean-noinstPROGRAMS:
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
+gras/$(am__dirstamp):
+	@$(MKDIR_P) gras
+	@: > gras/$(am__dirstamp)
+gras/datadesc_usage$(EXEEXT): $(gras_datadesc_usage_OBJECTS) $(gras_datadesc_usage_DEPENDENCIES) gras/$(am__dirstamp)
+	@rm -f gras/datadesc_usage$(EXEEXT)
+	$(LINK) $(gras_datadesc_usage_OBJECTS) $(gras_datadesc_usage_LDADD) $(LIBS)
+gras/trp_file_client$(EXEEXT): $(gras_trp_file_client_OBJECTS) $(gras_trp_file_client_DEPENDENCIES) gras/$(am__dirstamp)
+	@rm -f gras/trp_file_client$(EXEEXT)
+	$(LINK) $(gras_trp_file_client_OBJECTS) $(gras_trp_file_client_LDADD) $(LIBS)
+gras/trp_file_server$(EXEEXT): $(gras_trp_file_server_OBJECTS) $(gras_trp_file_server_DEPENDENCIES) gras/$(am__dirstamp)
+	@rm -f gras/trp_file_server$(EXEEXT)
+	$(LINK) $(gras_trp_file_server_OBJECTS) $(gras_trp_file_server_LDADD) $(LIBS)
+gras/trp_tcp_client$(EXEEXT): $(gras_trp_tcp_client_OBJECTS) $(gras_trp_tcp_client_DEPENDENCIES) gras/$(am__dirstamp)
+	@rm -f gras/trp_tcp_client$(EXEEXT)
+	$(LINK) $(gras_trp_tcp_client_OBJECTS) $(gras_trp_tcp_client_LDADD) $(LIBS)
+gras/trp_tcp_server$(EXEEXT): $(gras_trp_tcp_server_OBJECTS) $(gras_trp_tcp_server_DEPENDENCIES) gras/$(am__dirstamp)
+	@rm -f gras/trp_tcp_server$(EXEEXT)
+	$(LINK) $(gras_trp_tcp_server_OBJECTS) $(gras_trp_tcp_server_LDADD) $(LIBS)
 xbt/$(am__dirstamp):
 	@$(MKDIR_P) xbt
 	@: > xbt/$(am__dirstamp)
@@ -274,7 +341,13 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/datadesc_structs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/datadesc_usage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parallel_log_crashtest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trp_file_client.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trp_file_server.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trp_tcp_client.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trp_tcp_server.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -297,6 +370,90 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+datadesc_usage.o: gras/datadesc_usage.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT datadesc_usage.o -MD -MP -MF $(DEPDIR)/datadesc_usage.Tpo -c -o datadesc_usage.o `test -f 'gras/datadesc_usage.c' || echo '$(srcdir)/'`gras/datadesc_usage.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/datadesc_usage.Tpo $(DEPDIR)/datadesc_usage.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/datadesc_usage.c' object='datadesc_usage.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o datadesc_usage.o `test -f 'gras/datadesc_usage.c' || echo '$(srcdir)/'`gras/datadesc_usage.c
+
+datadesc_usage.obj: gras/datadesc_usage.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT datadesc_usage.obj -MD -MP -MF $(DEPDIR)/datadesc_usage.Tpo -c -o datadesc_usage.obj `if test -f 'gras/datadesc_usage.c'; then $(CYGPATH_W) 'gras/datadesc_usage.c'; else $(CYGPATH_W) '$(srcdir)/gras/datadesc_usage.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/datadesc_usage.Tpo $(DEPDIR)/datadesc_usage.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/datadesc_usage.c' object='datadesc_usage.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o datadesc_usage.obj `if test -f 'gras/datadesc_usage.c'; then $(CYGPATH_W) 'gras/datadesc_usage.c'; else $(CYGPATH_W) '$(srcdir)/gras/datadesc_usage.c'; fi`
+
+datadesc_structs.o: gras/datadesc_structs.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT datadesc_structs.o -MD -MP -MF $(DEPDIR)/datadesc_structs.Tpo -c -o datadesc_structs.o `test -f 'gras/datadesc_structs.c' || echo '$(srcdir)/'`gras/datadesc_structs.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/datadesc_structs.Tpo $(DEPDIR)/datadesc_structs.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/datadesc_structs.c' object='datadesc_structs.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o datadesc_structs.o `test -f 'gras/datadesc_structs.c' || echo '$(srcdir)/'`gras/datadesc_structs.c
+
+datadesc_structs.obj: gras/datadesc_structs.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT datadesc_structs.obj -MD -MP -MF $(DEPDIR)/datadesc_structs.Tpo -c -o datadesc_structs.obj `if test -f 'gras/datadesc_structs.c'; then $(CYGPATH_W) 'gras/datadesc_structs.c'; else $(CYGPATH_W) '$(srcdir)/gras/datadesc_structs.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/datadesc_structs.Tpo $(DEPDIR)/datadesc_structs.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/datadesc_structs.c' object='datadesc_structs.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o datadesc_structs.obj `if test -f 'gras/datadesc_structs.c'; then $(CYGPATH_W) 'gras/datadesc_structs.c'; else $(CYGPATH_W) '$(srcdir)/gras/datadesc_structs.c'; fi`
+
+trp_file_client.o: gras/trp_file_client.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trp_file_client.o -MD -MP -MF $(DEPDIR)/trp_file_client.Tpo -c -o trp_file_client.o `test -f 'gras/trp_file_client.c' || echo '$(srcdir)/'`gras/trp_file_client.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/trp_file_client.Tpo $(DEPDIR)/trp_file_client.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/trp_file_client.c' object='trp_file_client.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trp_file_client.o `test -f 'gras/trp_file_client.c' || echo '$(srcdir)/'`gras/trp_file_client.c
+
+trp_file_client.obj: gras/trp_file_client.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trp_file_client.obj -MD -MP -MF $(DEPDIR)/trp_file_client.Tpo -c -o trp_file_client.obj `if test -f 'gras/trp_file_client.c'; then $(CYGPATH_W) 'gras/trp_file_client.c'; else $(CYGPATH_W) '$(srcdir)/gras/trp_file_client.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/trp_file_client.Tpo $(DEPDIR)/trp_file_client.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/trp_file_client.c' object='trp_file_client.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trp_file_client.obj `if test -f 'gras/trp_file_client.c'; then $(CYGPATH_W) 'gras/trp_file_client.c'; else $(CYGPATH_W) '$(srcdir)/gras/trp_file_client.c'; fi`
+
+trp_file_server.o: gras/trp_file_server.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trp_file_server.o -MD -MP -MF $(DEPDIR)/trp_file_server.Tpo -c -o trp_file_server.o `test -f 'gras/trp_file_server.c' || echo '$(srcdir)/'`gras/trp_file_server.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/trp_file_server.Tpo $(DEPDIR)/trp_file_server.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/trp_file_server.c' object='trp_file_server.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trp_file_server.o `test -f 'gras/trp_file_server.c' || echo '$(srcdir)/'`gras/trp_file_server.c
+
+trp_file_server.obj: gras/trp_file_server.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trp_file_server.obj -MD -MP -MF $(DEPDIR)/trp_file_server.Tpo -c -o trp_file_server.obj `if test -f 'gras/trp_file_server.c'; then $(CYGPATH_W) 'gras/trp_file_server.c'; else $(CYGPATH_W) '$(srcdir)/gras/trp_file_server.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/trp_file_server.Tpo $(DEPDIR)/trp_file_server.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/trp_file_server.c' object='trp_file_server.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trp_file_server.obj `if test -f 'gras/trp_file_server.c'; then $(CYGPATH_W) 'gras/trp_file_server.c'; else $(CYGPATH_W) '$(srcdir)/gras/trp_file_server.c'; fi`
+
+trp_tcp_client.o: gras/trp_tcp_client.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trp_tcp_client.o -MD -MP -MF $(DEPDIR)/trp_tcp_client.Tpo -c -o trp_tcp_client.o `test -f 'gras/trp_tcp_client.c' || echo '$(srcdir)/'`gras/trp_tcp_client.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/trp_tcp_client.Tpo $(DEPDIR)/trp_tcp_client.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/trp_tcp_client.c' object='trp_tcp_client.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trp_tcp_client.o `test -f 'gras/trp_tcp_client.c' || echo '$(srcdir)/'`gras/trp_tcp_client.c
+
+trp_tcp_client.obj: gras/trp_tcp_client.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trp_tcp_client.obj -MD -MP -MF $(DEPDIR)/trp_tcp_client.Tpo -c -o trp_tcp_client.obj `if test -f 'gras/trp_tcp_client.c'; then $(CYGPATH_W) 'gras/trp_tcp_client.c'; else $(CYGPATH_W) '$(srcdir)/gras/trp_tcp_client.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/trp_tcp_client.Tpo $(DEPDIR)/trp_tcp_client.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/trp_tcp_client.c' object='trp_tcp_client.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trp_tcp_client.obj `if test -f 'gras/trp_tcp_client.c'; then $(CYGPATH_W) 'gras/trp_tcp_client.c'; else $(CYGPATH_W) '$(srcdir)/gras/trp_tcp_client.c'; fi`
+
+trp_tcp_server.o: gras/trp_tcp_server.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trp_tcp_server.o -MD -MP -MF $(DEPDIR)/trp_tcp_server.Tpo -c -o trp_tcp_server.o `test -f 'gras/trp_tcp_server.c' || echo '$(srcdir)/'`gras/trp_tcp_server.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/trp_tcp_server.Tpo $(DEPDIR)/trp_tcp_server.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/trp_tcp_server.c' object='trp_tcp_server.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trp_tcp_server.o `test -f 'gras/trp_tcp_server.c' || echo '$(srcdir)/'`gras/trp_tcp_server.c
+
+trp_tcp_server.obj: gras/trp_tcp_server.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trp_tcp_server.obj -MD -MP -MF $(DEPDIR)/trp_tcp_server.Tpo -c -o trp_tcp_server.obj `if test -f 'gras/trp_tcp_server.c'; then $(CYGPATH_W) 'gras/trp_tcp_server.c'; else $(CYGPATH_W) '$(srcdir)/gras/trp_tcp_server.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/trp_tcp_server.Tpo $(DEPDIR)/trp_tcp_server.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/trp_tcp_server.c' object='trp_tcp_server.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trp_tcp_server.obj `if test -f 'gras/trp_tcp_server.c'; then $(CYGPATH_W) 'gras/trp_tcp_server.c'; else $(CYGPATH_W) '$(srcdir)/gras/trp_tcp_server.c'; fi`
+
 parallel_log_crashtest.o: xbt/parallel_log_crashtest.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT parallel_log_crashtest.o -MD -MP -MF $(DEPDIR)/parallel_log_crashtest.Tpo -c -o parallel_log_crashtest.o `test -f 'xbt/parallel_log_crashtest.c' || echo '$(srcdir)/'`xbt/parallel_log_crashtest.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/parallel_log_crashtest.Tpo $(DEPDIR)/parallel_log_crashtest.Po
@@ -486,9 +643,11 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f gras/$(am__dirstamp)
 	-rm -f xbt/$(am__dirstamp)
 
 maintainer-clean-generic:
@@ -570,6 +729,9 @@ uninstall-am:
 	tags uninstall uninstall-am
 
 
+gras/datadesc_structs.c: gras/mk_datadesc_structs.pl
+	cd gras ; perl ../$(top_srcdir)/teshsuite/gras/mk_datadesc_structs.pl > datadesc_structs.c
+
 dist-files:
 	@for n in $(DISTFILES) ; do echo $(SRCFILE)$$n; done
 	@echo
diff --git a/testsuite/gras/datadesc.big32 b/teshsuite/gras/datadesc.big32
similarity index 100%
rename from testsuite/gras/datadesc.big32
rename to teshsuite/gras/datadesc.big32
diff --git a/testsuite/gras/datadesc.big32_2 b/teshsuite/gras/datadesc.big32_2
similarity index 100%
rename from testsuite/gras/datadesc.big32_2
rename to teshsuite/gras/datadesc.big32_2
diff --git a/testsuite/gras/datadesc.big32_8_4 b/teshsuite/gras/datadesc.big32_8_4
similarity index 100%
rename from testsuite/gras/datadesc.big32_8_4
rename to teshsuite/gras/datadesc.big32_8_4
diff --git a/testsuite/gras/datadesc.big64 b/teshsuite/gras/datadesc.big64
similarity index 100%
rename from testsuite/gras/datadesc.big64
rename to teshsuite/gras/datadesc.big64
diff --git a/testsuite/gras/datadesc.little32 b/teshsuite/gras/datadesc.little32
similarity index 100%
rename from testsuite/gras/datadesc.little32
rename to teshsuite/gras/datadesc.little32
diff --git a/testsuite/gras/datadesc.little32_4 b/teshsuite/gras/datadesc.little32_4
similarity index 100%
rename from testsuite/gras/datadesc.little32_4
rename to teshsuite/gras/datadesc.little32_4
diff --git a/testsuite/gras/datadesc.little64 b/teshsuite/gras/datadesc.little64
similarity index 100%
rename from testsuite/gras/datadesc.little64
rename to teshsuite/gras/datadesc.little64
diff --git a/teshsuite/gras/datadesc_mem.tesh b/teshsuite/gras/datadesc_mem.tesh
new file mode 100644
index 0000000000..8e2a0e3a0f
--- /dev/null
+++ b/teshsuite/gras/datadesc_mem.tesh
@@ -0,0 +1,20 @@
+
+p Check the marshaling facilities (trying to to do a in-memory copy)
+$ gras/datadesc_usage --copy --log=root.fmt:%m%n
+> ---- Test on integer ----
+> ---- Test on float ----
+> ---- Test on double ----
+> ---- Test on fixed array ----
+> ---- Test on a reference to an integer ----
+> ---- Test on string (ref to dynamic array) ----
+> ---- Test on dynar containing integers ----
+> ---- Test on all possible struct having 3 fields (49 structs) ----
+> ---- Test on homogeneous structure ----
+> ---- Test on heterogeneous structure ----
+> ---- Test on nested structures ----
+> ---- Test on chained list ----
+> ---- Test on graph (cyclique chained list of 3 items) ----
+> ---- Test on dynar containing integers ----
+> ---- Test on the PBIO IEEE struct (also tests GRAS DEFINE TYPE) ----
+> ---- Test on struct containing dynamic array and its size (cbps test) ----
+> Exiting GRAS
diff --git a/teshsuite/gras/datadesc_r_little32.tesh b/teshsuite/gras/datadesc_r_little32.tesh
new file mode 100644
index 0000000000..1e1072914e
--- /dev/null
+++ b/teshsuite/gras/datadesc_r_little32.tesh
@@ -0,0 +1,21 @@
+
+p Check the marshaling facilities (trying to read the result of windows/x86)
+$ gras/datadesc_usage --read ${srcdir:=.}/gras/datadesc.little32 --log=root.fmt:%m%n
+> This datafile was generated on little32 (2).
+> ---- Test on integer ----
+> ---- Test on float ----
+> ---- Test on double ----
+> ---- Test on fixed array ----
+> ---- Test on a reference to an integer ----
+> ---- Test on string (ref to dynamic array) ----
+> ---- Test on dynar containing integers ----
+> ---- Test on all possible struct having 3 fields (49 structs) ----
+> ---- Test on homogeneous structure ----
+> ---- Test on heterogeneous structure ----
+> ---- Test on nested structures ----
+> ---- Test on chained list ----
+> ---- Test on graph (cyclique chained list of 3 items) ----
+> ---- Test on dynar containing integers ----
+> ---- Test on the PBIO IEEE struct (also tests GRAS DEFINE TYPE) ----
+> ---- Test on struct containing dynamic array and its size (cbps test) ----
+> Exiting GRAS
diff --git a/teshsuite/gras/datadesc_r_little32_4.tesh b/teshsuite/gras/datadesc_r_little32_4.tesh
new file mode 100644
index 0000000000..6c535e111e
--- /dev/null
+++ b/teshsuite/gras/datadesc_r_little32_4.tesh
@@ -0,0 +1,21 @@
+
+p Check the marshaling facilities (trying to read the result of linux/x86)
+$ gras/datadesc_usage --read ${srcdir:=.}/gras/datadesc.little32_4 --log=root.fmt:%m%n
+> This datafile was generated on little32_4 (2).
+> ---- Test on integer ----
+> ---- Test on float ----
+> ---- Test on double ----
+> ---- Test on fixed array ----
+> ---- Test on a reference to an integer ----
+> ---- Test on string (ref to dynamic array) ----
+> ---- Test on dynar containing integers ----
+> ---- Test on all possible struct having 3 fields (49 structs) ----
+> ---- Test on homogeneous structure ----
+> ---- Test on heterogeneous structure ----
+> ---- Test on nested structures ----
+> ---- Test on chained list ----
+> ---- Test on graph (cyclique chained list of 3 items) ----
+> ---- Test on dynar containing integers ----
+> ---- Test on the PBIO IEEE struct (also tests GRAS DEFINE TYPE) ----
+> ---- Test on struct containing dynamic array and its size (cbps test) ----
+> Exiting GRAS
diff --git a/teshsuite/gras/datadesc_r_little64.tesh b/teshsuite/gras/datadesc_r_little64.tesh
new file mode 100644
index 0000000000..2d9698820f
--- /dev/null
+++ b/teshsuite/gras/datadesc_r_little64.tesh
@@ -0,0 +1,21 @@
+
+p Check the marshaling facilities (trying to read the result of linux/amd64)
+$ gras/datadesc_usage --read ${srcdir:=.}/gras/datadesc.little64 --log=root.fmt:%m%n
+> This datafile was generated on little64 (4).
+> ---- Test on integer ----
+> ---- Test on float ----
+> ---- Test on double ----
+> ---- Test on fixed array ----
+> ---- Test on a reference to an integer ----
+> ---- Test on string (ref to dynamic array) ----
+> ---- Test on dynar containing integers ----
+> ---- Test on all possible struct having 3 fields (49 structs) ----
+> ---- Test on homogeneous structure ----
+> ---- Test on heterogeneous structure ----
+> ---- Test on nested structures ----
+> ---- Test on chained list ----
+> ---- Test on graph (cyclique chained list of 3 items) ----
+> ---- Test on dynar containing integers ----
+> ---- Test on the PBIO IEEE struct (also tests GRAS DEFINE TYPE) ----
+> ---- Test on struct containing dynamic array and its size (cbps test) ----
+> Exiting GRAS
diff --git a/teshsuite/gras/datadesc_rw.tesh b/teshsuite/gras/datadesc_rw.tesh
new file mode 100644
index 0000000000..9c26b05918
--- /dev/null
+++ b/teshsuite/gras/datadesc_rw.tesh
@@ -0,0 +1,20 @@
+
+p Check the marshaling facilities (trying to read what we write)
+$ gras/datadesc_usage --log=root.fmt:%m%n
+> ---- Test on integer ----
+> ---- Test on float ----
+> ---- Test on double ----
+> ---- Test on fixed array ----
+> ---- Test on a reference to an integer ----
+> ---- Test on string (ref to dynamic array) ----
+> ---- Test on dynar containing integers ----
+> ---- Test on all possible struct having 3 fields (49 structs) ----
+> ---- Test on homogeneous structure ----
+> ---- Test on heterogeneous structure ----
+> ---- Test on nested structures ----
+> ---- Test on chained list ----
+> ---- Test on graph (cyclique chained list of 3 items) ----
+> ---- Test on dynar containing integers ----
+> ---- Test on the PBIO IEEE struct (also tests GRAS DEFINE TYPE) ----
+> ---- Test on struct containing dynamic array and its size (cbps test) ----
+> Exiting GRAS
diff --git a/teshsuite/gras/datadesc_structs.c b/teshsuite/gras/datadesc_structs.c
new file mode 100644
index 0000000000..0a593c15dd
--- /dev/null
+++ b/teshsuite/gras/datadesc_structs.c
@@ -0,0 +1,557 @@
+/* This file is perl-generated, of course */
+
+#include "gras.h"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(structs,test,"Logs about the gigantic struct test");
+
+#define READ  0
+#define WRITE 1
+#define RW    2
+
+void write_read(gras_datadesc_type_t type,void *src, void *dst, gras_socket_t *sock, int direction);
+
+GRAS_DEFINE_TYPE(cccc,struct cccc { char a; char b; char c;char d;};)
+GRAS_DEFINE_TYPE(ccsc,struct ccsc { char a; char b; short int c;char d;};)
+GRAS_DEFINE_TYPE(ccic,struct ccic { char a; char b; int c;char d;};)
+GRAS_DEFINE_TYPE(cclc,struct cclc { char a; char b; long int c;char d;};)
+GRAS_DEFINE_TYPE(ccLc,struct ccLc { char a; char b; long long int c;char d;};)
+GRAS_DEFINE_TYPE(ccfc,struct ccfc { char a; char b; float c;char d;};)
+GRAS_DEFINE_TYPE(ccdc,struct ccdc { char a; char b; double c;char d;};)
+GRAS_DEFINE_TYPE(sccc,struct sccc { short int a; char b; char c;char d;};)
+GRAS_DEFINE_TYPE(scsc,struct scsc { short int a; char b; short int c;char d;};)
+GRAS_DEFINE_TYPE(scic,struct scic { short int a; char b; int c;char d;};)
+GRAS_DEFINE_TYPE(sclc,struct sclc { short int a; char b; long int c;char d;};)
+GRAS_DEFINE_TYPE(scLc,struct scLc { short int a; char b; long long int c;char d;};)
+GRAS_DEFINE_TYPE(scfc,struct scfc { short int a; char b; float c;char d;};)
+GRAS_DEFINE_TYPE(scdc,struct scdc { short int a; char b; double c;char d;};)
+GRAS_DEFINE_TYPE(iccc,struct iccc { int a; char b; char c;char d;};)
+GRAS_DEFINE_TYPE(icsc,struct icsc { int a; char b; short int c;char d;};)
+GRAS_DEFINE_TYPE(icic,struct icic { int a; char b; int c;char d;};)
+GRAS_DEFINE_TYPE(iclc,struct iclc { int a; char b; long int c;char d;};)
+GRAS_DEFINE_TYPE(icLc,struct icLc { int a; char b; long long int c;char d;};)
+GRAS_DEFINE_TYPE(icfc,struct icfc { int a; char b; float c;char d;};)
+GRAS_DEFINE_TYPE(icdc,struct icdc { int a; char b; double c;char d;};)
+GRAS_DEFINE_TYPE(lccc,struct lccc { long int a; char b; char c;char d;};)
+GRAS_DEFINE_TYPE(lcsc,struct lcsc { long int a; char b; short int c;char d;};)
+GRAS_DEFINE_TYPE(lcic,struct lcic { long int a; char b; int c;char d;};)
+GRAS_DEFINE_TYPE(lclc,struct lclc { long int a; char b; long int c;char d;};)
+GRAS_DEFINE_TYPE(lcLc,struct lcLc { long int a; char b; long long int c;char d;};)
+GRAS_DEFINE_TYPE(lcfc,struct lcfc { long int a; char b; float c;char d;};)
+GRAS_DEFINE_TYPE(lcdc,struct lcdc { long int a; char b; double c;char d;};)
+GRAS_DEFINE_TYPE(Lccc,struct Lccc { long long int a; char b; char c;char d;};)
+GRAS_DEFINE_TYPE(Lcsc,struct Lcsc { long long int a; char b; short int c;char d;};)
+GRAS_DEFINE_TYPE(Lcic,struct Lcic { long long int a; char b; int c;char d;};)
+GRAS_DEFINE_TYPE(Lclc,struct Lclc { long long int a; char b; long int c;char d;};)
+GRAS_DEFINE_TYPE(LcLc,struct LcLc { long long int a; char b; long long int c;char d;};)
+GRAS_DEFINE_TYPE(Lcfc,struct Lcfc { long long int a; char b; float c;char d;};)
+GRAS_DEFINE_TYPE(Lcdc,struct Lcdc { long long int a; char b; double c;char d;};)
+GRAS_DEFINE_TYPE(fccc,struct fccc { float a; char b; char c;char d;};)
+GRAS_DEFINE_TYPE(fcsc,struct fcsc { float a; char b; short int c;char d;};)
+GRAS_DEFINE_TYPE(fcic,struct fcic { float a; char b; int c;char d;};)
+GRAS_DEFINE_TYPE(fclc,struct fclc { float a; char b; long int c;char d;};)
+GRAS_DEFINE_TYPE(fcLc,struct fcLc { float a; char b; long long int c;char d;};)
+GRAS_DEFINE_TYPE(fcfc,struct fcfc { float a; char b; float c;char d;};)
+GRAS_DEFINE_TYPE(fcdc,struct fcdc { float a; char b; double c;char d;};)
+GRAS_DEFINE_TYPE(dccc,struct dccc { double a; char b; char c;char d;};)
+GRAS_DEFINE_TYPE(dcsc,struct dcsc { double a; char b; short int c;char d;};)
+GRAS_DEFINE_TYPE(dcic,struct dcic { double a; char b; int c;char d;};)
+GRAS_DEFINE_TYPE(dclc,struct dclc { double a; char b; long int c;char d;};)
+GRAS_DEFINE_TYPE(dcLc,struct dcLc { double a; char b; long long int c;char d;};)
+GRAS_DEFINE_TYPE(dcfc,struct dcfc { double a; char b; float c;char d;};)
+GRAS_DEFINE_TYPE(dcdc,struct dcdc { double a; char b; double c;char d;};)
+
+#define test(a) xbt_assert(a)
+void test_structures(gras_socket_t *sock, int direction);
+void test_structures(gras_socket_t *sock, int direction) {
+  struct cccc my_cccc = {'w'+(char)1,'w'+(char)2,'w'+(char)3,'w'+(char)4}, my_cccc2;
+  struct ccsc my_ccsc = {'w'+(char)1,'w'+(char)2,134+(short int)3,'w'+(char)4}, my_ccsc2;
+  struct ccic my_ccic = {'w'+(char)1,'w'+(char)2,-11249+(int)3,'w'+(char)4}, my_ccic2;
+  struct cclc my_cclc = {'w'+(char)1,'w'+(char)2,31319919+(long int)3,'w'+(char)4}, my_cclc2;
+  struct ccLc my_ccLc = {'w'+(char)1,'w'+(char)2,-232130010+(long long int)3,'w'+(char)4}, my_ccLc2;
+  struct ccfc my_ccfc = {'w'+(char)1,'w'+(char)2,-11313.1135+(float)3,'w'+(char)4}, my_ccfc2;
+  struct ccdc my_ccdc = {'w'+(char)1,'w'+(char)2,1424420.11331+(double)3,'w'+(char)4}, my_ccdc2;
+  struct sccc my_sccc = {134+(short int)1,'w'+(char)2,'w'+(char)3,'w'+(char)4}, my_sccc2;
+  struct scsc my_scsc = {134+(short int)1,'w'+(char)2,134+(short int)3,'w'+(char)4}, my_scsc2;
+  struct scic my_scic = {134+(short int)1,'w'+(char)2,-11249+(int)3,'w'+(char)4}, my_scic2;
+  struct sclc my_sclc = {134+(short int)1,'w'+(char)2,31319919+(long int)3,'w'+(char)4}, my_sclc2;
+  struct scLc my_scLc = {134+(short int)1,'w'+(char)2,-232130010+(long long int)3,'w'+(char)4}, my_scLc2;
+  struct scfc my_scfc = {134+(short int)1,'w'+(char)2,-11313.1135+(float)3,'w'+(char)4}, my_scfc2;
+  struct scdc my_scdc = {134+(short int)1,'w'+(char)2,1424420.11331+(double)3,'w'+(char)4}, my_scdc2;
+  struct iccc my_iccc = {-11249+(int)1,'w'+(char)2,'w'+(char)3,'w'+(char)4}, my_iccc2;
+  struct icsc my_icsc = {-11249+(int)1,'w'+(char)2,134+(short int)3,'w'+(char)4}, my_icsc2;
+  struct icic my_icic = {-11249+(int)1,'w'+(char)2,-11249+(int)3,'w'+(char)4}, my_icic2;
+  struct iclc my_iclc = {-11249+(int)1,'w'+(char)2,31319919+(long int)3,'w'+(char)4}, my_iclc2;
+  struct icLc my_icLc = {-11249+(int)1,'w'+(char)2,-232130010+(long long int)3,'w'+(char)4}, my_icLc2;
+  struct icfc my_icfc = {-11249+(int)1,'w'+(char)2,-11313.1135+(float)3,'w'+(char)4}, my_icfc2;
+  struct icdc my_icdc = {-11249+(int)1,'w'+(char)2,1424420.11331+(double)3,'w'+(char)4}, my_icdc2;
+  struct lccc my_lccc = {31319919+(long int)1,'w'+(char)2,'w'+(char)3,'w'+(char)4}, my_lccc2;
+  struct lcsc my_lcsc = {31319919+(long int)1,'w'+(char)2,134+(short int)3,'w'+(char)4}, my_lcsc2;
+  struct lcic my_lcic = {31319919+(long int)1,'w'+(char)2,-11249+(int)3,'w'+(char)4}, my_lcic2;
+  struct lclc my_lclc = {31319919+(long int)1,'w'+(char)2,31319919+(long int)3,'w'+(char)4}, my_lclc2;
+  struct lcLc my_lcLc = {31319919+(long int)1,'w'+(char)2,-232130010+(long long int)3,'w'+(char)4}, my_lcLc2;
+  struct lcfc my_lcfc = {31319919+(long int)1,'w'+(char)2,-11313.1135+(float)3,'w'+(char)4}, my_lcfc2;
+  struct lcdc my_lcdc = {31319919+(long int)1,'w'+(char)2,1424420.11331+(double)3,'w'+(char)4}, my_lcdc2;
+  struct Lccc my_Lccc = {-232130010+(long long int)1,'w'+(char)2,'w'+(char)3,'w'+(char)4}, my_Lccc2;
+  struct Lcsc my_Lcsc = {-232130010+(long long int)1,'w'+(char)2,134+(short int)3,'w'+(char)4}, my_Lcsc2;
+  struct Lcic my_Lcic = {-232130010+(long long int)1,'w'+(char)2,-11249+(int)3,'w'+(char)4}, my_Lcic2;
+  struct Lclc my_Lclc = {-232130010+(long long int)1,'w'+(char)2,31319919+(long int)3,'w'+(char)4}, my_Lclc2;
+  struct LcLc my_LcLc = {-232130010+(long long int)1,'w'+(char)2,-232130010+(long long int)3,'w'+(char)4}, my_LcLc2;
+  struct Lcfc my_Lcfc = {-232130010+(long long int)1,'w'+(char)2,-11313.1135+(float)3,'w'+(char)4}, my_Lcfc2;
+  struct Lcdc my_Lcdc = {-232130010+(long long int)1,'w'+(char)2,1424420.11331+(double)3,'w'+(char)4}, my_Lcdc2;
+  struct fccc my_fccc = {-11313.1135+(float)1,'w'+(char)2,'w'+(char)3,'w'+(char)4}, my_fccc2;
+  struct fcsc my_fcsc = {-11313.1135+(float)1,'w'+(char)2,134+(short int)3,'w'+(char)4}, my_fcsc2;
+  struct fcic my_fcic = {-11313.1135+(float)1,'w'+(char)2,-11249+(int)3,'w'+(char)4}, my_fcic2;
+  struct fclc my_fclc = {-11313.1135+(float)1,'w'+(char)2,31319919+(long int)3,'w'+(char)4}, my_fclc2;
+  struct fcLc my_fcLc = {-11313.1135+(float)1,'w'+(char)2,-232130010+(long long int)3,'w'+(char)4}, my_fcLc2;
+  struct fcfc my_fcfc = {-11313.1135+(float)1,'w'+(char)2,-11313.1135+(float)3,'w'+(char)4}, my_fcfc2;
+  struct fcdc my_fcdc = {-11313.1135+(float)1,'w'+(char)2,1424420.11331+(double)3,'w'+(char)4}, my_fcdc2;
+  struct dccc my_dccc = {1424420.11331+(double)1,'w'+(char)2,'w'+(char)3,'w'+(char)4}, my_dccc2;
+  struct dcsc my_dcsc = {1424420.11331+(double)1,'w'+(char)2,134+(short int)3,'w'+(char)4}, my_dcsc2;
+  struct dcic my_dcic = {1424420.11331+(double)1,'w'+(char)2,-11249+(int)3,'w'+(char)4}, my_dcic2;
+  struct dclc my_dclc = {1424420.11331+(double)1,'w'+(char)2,31319919+(long int)3,'w'+(char)4}, my_dclc2;
+  struct dcLc my_dcLc = {1424420.11331+(double)1,'w'+(char)2,-232130010+(long long int)3,'w'+(char)4}, my_dcLc2;
+  struct dcfc my_dcfc = {1424420.11331+(double)1,'w'+(char)2,-11313.1135+(float)3,'w'+(char)4}, my_dcfc2;
+  struct dcdc my_dcdc = {1424420.11331+(double)1,'w'+(char)2,1424420.11331+(double)3,'w'+(char)4}, my_dcdc2;
+  INFO0("---- Test on all possible struct having 3 fields (49 structs) ----");
+  write_read(gras_datadesc_by_symbol(cccc), &my_cccc, &my_cccc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_cccc.a == my_cccc2.a);
+     test(my_cccc.b == my_cccc2.b);
+     test(my_cccc.c == my_cccc2.c);
+     test(my_cccc.d == my_cccc2.d);
+     if (!failed) VERB0("Passed cccc");
+  }
+  write_read(gras_datadesc_by_symbol(ccsc), &my_ccsc, &my_ccsc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_ccsc.a == my_ccsc2.a);
+     test(my_ccsc.b == my_ccsc2.b);
+     test(my_ccsc.c == my_ccsc2.c);
+     test(my_ccsc.d == my_ccsc2.d);
+     if (!failed) VERB0("Passed ccsc");
+  }
+  write_read(gras_datadesc_by_symbol(ccic), &my_ccic, &my_ccic2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_ccic.a == my_ccic2.a);
+     test(my_ccic.b == my_ccic2.b);
+     test(my_ccic.c == my_ccic2.c);
+     test(my_ccic.d == my_ccic2.d);
+     if (!failed) VERB0("Passed ccic");
+  }
+  write_read(gras_datadesc_by_symbol(cclc), &my_cclc, &my_cclc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_cclc.a == my_cclc2.a);
+     test(my_cclc.b == my_cclc2.b);
+     test(my_cclc.c == my_cclc2.c);
+     test(my_cclc.d == my_cclc2.d);
+     if (!failed) VERB0("Passed cclc");
+  }
+  write_read(gras_datadesc_by_symbol(ccLc), &my_ccLc, &my_ccLc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_ccLc.a == my_ccLc2.a);
+     test(my_ccLc.b == my_ccLc2.b);
+     test(my_ccLc.c == my_ccLc2.c);
+     test(my_ccLc.d == my_ccLc2.d);
+     if (!failed) VERB0("Passed ccLc");
+  }
+  write_read(gras_datadesc_by_symbol(ccfc), &my_ccfc, &my_ccfc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_ccfc.a == my_ccfc2.a);
+     test(my_ccfc.b == my_ccfc2.b);
+     test(my_ccfc.c == my_ccfc2.c);
+     test(my_ccfc.d == my_ccfc2.d);
+     if (!failed) VERB0("Passed ccfc");
+  }
+  write_read(gras_datadesc_by_symbol(ccdc), &my_ccdc, &my_ccdc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_ccdc.a == my_ccdc2.a);
+     test(my_ccdc.b == my_ccdc2.b);
+     test(my_ccdc.c == my_ccdc2.c);
+     test(my_ccdc.d == my_ccdc2.d);
+     if (!failed) VERB0("Passed ccdc");
+  }
+  write_read(gras_datadesc_by_symbol(sccc), &my_sccc, &my_sccc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_sccc.a == my_sccc2.a);
+     test(my_sccc.b == my_sccc2.b);
+     test(my_sccc.c == my_sccc2.c);
+     test(my_sccc.d == my_sccc2.d);
+     if (!failed) VERB0("Passed sccc");
+  }
+  write_read(gras_datadesc_by_symbol(scsc), &my_scsc, &my_scsc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_scsc.a == my_scsc2.a);
+     test(my_scsc.b == my_scsc2.b);
+     test(my_scsc.c == my_scsc2.c);
+     test(my_scsc.d == my_scsc2.d);
+     if (!failed) VERB0("Passed scsc");
+  }
+  write_read(gras_datadesc_by_symbol(scic), &my_scic, &my_scic2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_scic.a == my_scic2.a);
+     test(my_scic.b == my_scic2.b);
+     test(my_scic.c == my_scic2.c);
+     test(my_scic.d == my_scic2.d);
+     if (!failed) VERB0("Passed scic");
+  }
+  write_read(gras_datadesc_by_symbol(sclc), &my_sclc, &my_sclc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_sclc.a == my_sclc2.a);
+     test(my_sclc.b == my_sclc2.b);
+     test(my_sclc.c == my_sclc2.c);
+     test(my_sclc.d == my_sclc2.d);
+     if (!failed) VERB0("Passed sclc");
+  }
+  write_read(gras_datadesc_by_symbol(scLc), &my_scLc, &my_scLc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_scLc.a == my_scLc2.a);
+     test(my_scLc.b == my_scLc2.b);
+     test(my_scLc.c == my_scLc2.c);
+     test(my_scLc.d == my_scLc2.d);
+     if (!failed) VERB0("Passed scLc");
+  }
+  write_read(gras_datadesc_by_symbol(scfc), &my_scfc, &my_scfc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_scfc.a == my_scfc2.a);
+     test(my_scfc.b == my_scfc2.b);
+     test(my_scfc.c == my_scfc2.c);
+     test(my_scfc.d == my_scfc2.d);
+     if (!failed) VERB0("Passed scfc");
+  }
+  write_read(gras_datadesc_by_symbol(scdc), &my_scdc, &my_scdc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_scdc.a == my_scdc2.a);
+     test(my_scdc.b == my_scdc2.b);
+     test(my_scdc.c == my_scdc2.c);
+     test(my_scdc.d == my_scdc2.d);
+     if (!failed) VERB0("Passed scdc");
+  }
+  write_read(gras_datadesc_by_symbol(iccc), &my_iccc, &my_iccc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_iccc.a == my_iccc2.a);
+     test(my_iccc.b == my_iccc2.b);
+     test(my_iccc.c == my_iccc2.c);
+     test(my_iccc.d == my_iccc2.d);
+     if (!failed) VERB0("Passed iccc");
+  }
+  write_read(gras_datadesc_by_symbol(icsc), &my_icsc, &my_icsc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_icsc.a == my_icsc2.a);
+     test(my_icsc.b == my_icsc2.b);
+     test(my_icsc.c == my_icsc2.c);
+     test(my_icsc.d == my_icsc2.d);
+     if (!failed) VERB0("Passed icsc");
+  }
+  write_read(gras_datadesc_by_symbol(icic), &my_icic, &my_icic2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_icic.a == my_icic2.a);
+     test(my_icic.b == my_icic2.b);
+     test(my_icic.c == my_icic2.c);
+     test(my_icic.d == my_icic2.d);
+     if (!failed) VERB0("Passed icic");
+  }
+  write_read(gras_datadesc_by_symbol(iclc), &my_iclc, &my_iclc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_iclc.a == my_iclc2.a);
+     test(my_iclc.b == my_iclc2.b);
+     test(my_iclc.c == my_iclc2.c);
+     test(my_iclc.d == my_iclc2.d);
+     if (!failed) VERB0("Passed iclc");
+  }
+  write_read(gras_datadesc_by_symbol(icLc), &my_icLc, &my_icLc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_icLc.a == my_icLc2.a);
+     test(my_icLc.b == my_icLc2.b);
+     test(my_icLc.c == my_icLc2.c);
+     test(my_icLc.d == my_icLc2.d);
+     if (!failed) VERB0("Passed icLc");
+  }
+  write_read(gras_datadesc_by_symbol(icfc), &my_icfc, &my_icfc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_icfc.a == my_icfc2.a);
+     test(my_icfc.b == my_icfc2.b);
+     test(my_icfc.c == my_icfc2.c);
+     test(my_icfc.d == my_icfc2.d);
+     if (!failed) VERB0("Passed icfc");
+  }
+  write_read(gras_datadesc_by_symbol(icdc), &my_icdc, &my_icdc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_icdc.a == my_icdc2.a);
+     test(my_icdc.b == my_icdc2.b);
+     test(my_icdc.c == my_icdc2.c);
+     test(my_icdc.d == my_icdc2.d);
+     if (!failed) VERB0("Passed icdc");
+  }
+  write_read(gras_datadesc_by_symbol(lccc), &my_lccc, &my_lccc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_lccc.a == my_lccc2.a);
+     test(my_lccc.b == my_lccc2.b);
+     test(my_lccc.c == my_lccc2.c);
+     test(my_lccc.d == my_lccc2.d);
+     if (!failed) VERB0("Passed lccc");
+  }
+  write_read(gras_datadesc_by_symbol(lcsc), &my_lcsc, &my_lcsc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_lcsc.a == my_lcsc2.a);
+     test(my_lcsc.b == my_lcsc2.b);
+     test(my_lcsc.c == my_lcsc2.c);
+     test(my_lcsc.d == my_lcsc2.d);
+     if (!failed) VERB0("Passed lcsc");
+  }
+  write_read(gras_datadesc_by_symbol(lcic), &my_lcic, &my_lcic2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_lcic.a == my_lcic2.a);
+     test(my_lcic.b == my_lcic2.b);
+     test(my_lcic.c == my_lcic2.c);
+     test(my_lcic.d == my_lcic2.d);
+     if (!failed) VERB0("Passed lcic");
+  }
+  write_read(gras_datadesc_by_symbol(lclc), &my_lclc, &my_lclc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_lclc.a == my_lclc2.a);
+     test(my_lclc.b == my_lclc2.b);
+     test(my_lclc.c == my_lclc2.c);
+     test(my_lclc.d == my_lclc2.d);
+     if (!failed) VERB0("Passed lclc");
+  }
+  write_read(gras_datadesc_by_symbol(lcLc), &my_lcLc, &my_lcLc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_lcLc.a == my_lcLc2.a);
+     test(my_lcLc.b == my_lcLc2.b);
+     test(my_lcLc.c == my_lcLc2.c);
+     test(my_lcLc.d == my_lcLc2.d);
+     if (!failed) VERB0("Passed lcLc");
+  }
+  write_read(gras_datadesc_by_symbol(lcfc), &my_lcfc, &my_lcfc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_lcfc.a == my_lcfc2.a);
+     test(my_lcfc.b == my_lcfc2.b);
+     test(my_lcfc.c == my_lcfc2.c);
+     test(my_lcfc.d == my_lcfc2.d);
+     if (!failed) VERB0("Passed lcfc");
+  }
+  write_read(gras_datadesc_by_symbol(lcdc), &my_lcdc, &my_lcdc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_lcdc.a == my_lcdc2.a);
+     test(my_lcdc.b == my_lcdc2.b);
+     test(my_lcdc.c == my_lcdc2.c);
+     test(my_lcdc.d == my_lcdc2.d);
+     if (!failed) VERB0("Passed lcdc");
+  }
+  write_read(gras_datadesc_by_symbol(Lccc), &my_Lccc, &my_Lccc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_Lccc.a == my_Lccc2.a);
+     test(my_Lccc.b == my_Lccc2.b);
+     test(my_Lccc.c == my_Lccc2.c);
+     test(my_Lccc.d == my_Lccc2.d);
+     if (!failed) VERB0("Passed Lccc");
+  }
+  write_read(gras_datadesc_by_symbol(Lcsc), &my_Lcsc, &my_Lcsc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_Lcsc.a == my_Lcsc2.a);
+     test(my_Lcsc.b == my_Lcsc2.b);
+     test(my_Lcsc.c == my_Lcsc2.c);
+     test(my_Lcsc.d == my_Lcsc2.d);
+     if (!failed) VERB0("Passed Lcsc");
+  }
+  write_read(gras_datadesc_by_symbol(Lcic), &my_Lcic, &my_Lcic2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_Lcic.a == my_Lcic2.a);
+     test(my_Lcic.b == my_Lcic2.b);
+     test(my_Lcic.c == my_Lcic2.c);
+     test(my_Lcic.d == my_Lcic2.d);
+     if (!failed) VERB0("Passed Lcic");
+  }
+  write_read(gras_datadesc_by_symbol(Lclc), &my_Lclc, &my_Lclc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_Lclc.a == my_Lclc2.a);
+     test(my_Lclc.b == my_Lclc2.b);
+     test(my_Lclc.c == my_Lclc2.c);
+     test(my_Lclc.d == my_Lclc2.d);
+     if (!failed) VERB0("Passed Lclc");
+  }
+  write_read(gras_datadesc_by_symbol(LcLc), &my_LcLc, &my_LcLc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_LcLc.a == my_LcLc2.a);
+     test(my_LcLc.b == my_LcLc2.b);
+     test(my_LcLc.c == my_LcLc2.c);
+     test(my_LcLc.d == my_LcLc2.d);
+     if (!failed) VERB0("Passed LcLc");
+  }
+  write_read(gras_datadesc_by_symbol(Lcfc), &my_Lcfc, &my_Lcfc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_Lcfc.a == my_Lcfc2.a);
+     test(my_Lcfc.b == my_Lcfc2.b);
+     test(my_Lcfc.c == my_Lcfc2.c);
+     test(my_Lcfc.d == my_Lcfc2.d);
+     if (!failed) VERB0("Passed Lcfc");
+  }
+  write_read(gras_datadesc_by_symbol(Lcdc), &my_Lcdc, &my_Lcdc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_Lcdc.a == my_Lcdc2.a);
+     test(my_Lcdc.b == my_Lcdc2.b);
+     test(my_Lcdc.c == my_Lcdc2.c);
+     test(my_Lcdc.d == my_Lcdc2.d);
+     if (!failed) VERB0("Passed Lcdc");
+  }
+  write_read(gras_datadesc_by_symbol(fccc), &my_fccc, &my_fccc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_fccc.a == my_fccc2.a);
+     test(my_fccc.b == my_fccc2.b);
+     test(my_fccc.c == my_fccc2.c);
+     test(my_fccc.d == my_fccc2.d);
+     if (!failed) VERB0("Passed fccc");
+  }
+  write_read(gras_datadesc_by_symbol(fcsc), &my_fcsc, &my_fcsc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_fcsc.a == my_fcsc2.a);
+     test(my_fcsc.b == my_fcsc2.b);
+     test(my_fcsc.c == my_fcsc2.c);
+     test(my_fcsc.d == my_fcsc2.d);
+     if (!failed) VERB0("Passed fcsc");
+  }
+  write_read(gras_datadesc_by_symbol(fcic), &my_fcic, &my_fcic2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_fcic.a == my_fcic2.a);
+     test(my_fcic.b == my_fcic2.b);
+     test(my_fcic.c == my_fcic2.c);
+     test(my_fcic.d == my_fcic2.d);
+     if (!failed) VERB0("Passed fcic");
+  }
+  write_read(gras_datadesc_by_symbol(fclc), &my_fclc, &my_fclc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_fclc.a == my_fclc2.a);
+     test(my_fclc.b == my_fclc2.b);
+     test(my_fclc.c == my_fclc2.c);
+     test(my_fclc.d == my_fclc2.d);
+     if (!failed) VERB0("Passed fclc");
+  }
+  write_read(gras_datadesc_by_symbol(fcLc), &my_fcLc, &my_fcLc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_fcLc.a == my_fcLc2.a);
+     test(my_fcLc.b == my_fcLc2.b);
+     test(my_fcLc.c == my_fcLc2.c);
+     test(my_fcLc.d == my_fcLc2.d);
+     if (!failed) VERB0("Passed fcLc");
+  }
+  write_read(gras_datadesc_by_symbol(fcfc), &my_fcfc, &my_fcfc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_fcfc.a == my_fcfc2.a);
+     test(my_fcfc.b == my_fcfc2.b);
+     test(my_fcfc.c == my_fcfc2.c);
+     test(my_fcfc.d == my_fcfc2.d);
+     if (!failed) VERB0("Passed fcfc");
+  }
+  write_read(gras_datadesc_by_symbol(fcdc), &my_fcdc, &my_fcdc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_fcdc.a == my_fcdc2.a);
+     test(my_fcdc.b == my_fcdc2.b);
+     test(my_fcdc.c == my_fcdc2.c);
+     test(my_fcdc.d == my_fcdc2.d);
+     if (!failed) VERB0("Passed fcdc");
+  }
+  write_read(gras_datadesc_by_symbol(dccc), &my_dccc, &my_dccc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_dccc.a == my_dccc2.a);
+     test(my_dccc.b == my_dccc2.b);
+     test(my_dccc.c == my_dccc2.c);
+     test(my_dccc.d == my_dccc2.d);
+     if (!failed) VERB0("Passed dccc");
+  }
+  write_read(gras_datadesc_by_symbol(dcsc), &my_dcsc, &my_dcsc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_dcsc.a == my_dcsc2.a);
+     test(my_dcsc.b == my_dcsc2.b);
+     test(my_dcsc.c == my_dcsc2.c);
+     test(my_dcsc.d == my_dcsc2.d);
+     if (!failed) VERB0("Passed dcsc");
+  }
+  write_read(gras_datadesc_by_symbol(dcic), &my_dcic, &my_dcic2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_dcic.a == my_dcic2.a);
+     test(my_dcic.b == my_dcic2.b);
+     test(my_dcic.c == my_dcic2.c);
+     test(my_dcic.d == my_dcic2.d);
+     if (!failed) VERB0("Passed dcic");
+  }
+  write_read(gras_datadesc_by_symbol(dclc), &my_dclc, &my_dclc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_dclc.a == my_dclc2.a);
+     test(my_dclc.b == my_dclc2.b);
+     test(my_dclc.c == my_dclc2.c);
+     test(my_dclc.d == my_dclc2.d);
+     if (!failed) VERB0("Passed dclc");
+  }
+  write_read(gras_datadesc_by_symbol(dcLc), &my_dcLc, &my_dcLc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_dcLc.a == my_dcLc2.a);
+     test(my_dcLc.b == my_dcLc2.b);
+     test(my_dcLc.c == my_dcLc2.c);
+     test(my_dcLc.d == my_dcLc2.d);
+     if (!failed) VERB0("Passed dcLc");
+  }
+  write_read(gras_datadesc_by_symbol(dcfc), &my_dcfc, &my_dcfc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_dcfc.a == my_dcfc2.a);
+     test(my_dcfc.b == my_dcfc2.b);
+     test(my_dcfc.c == my_dcfc2.c);
+     test(my_dcfc.d == my_dcfc2.d);
+     if (!failed) VERB0("Passed dcfc");
+  }
+  write_read(gras_datadesc_by_symbol(dcdc), &my_dcdc, &my_dcdc2, sock,direction);
+  if (direction == READ || direction == RW) {
+     int failed = 0;
+     test(my_dcdc.a == my_dcdc2.a);
+     test(my_dcdc.b == my_dcdc2.b);
+     test(my_dcdc.c == my_dcdc2.c);
+     test(my_dcdc.d == my_dcdc2.d);
+     if (!failed) VERB0("Passed dcdc");
+  }
+}
diff --git a/testsuite/gras/datadesc_usage.c b/teshsuite/gras/datadesc_usage.c
similarity index 100%
rename from testsuite/gras/datadesc_usage.c
rename to teshsuite/gras/datadesc_usage.c
diff --git a/testsuite/gras/mk_datadesc_structs.pl b/teshsuite/gras/mk_datadesc_structs.pl
similarity index 100%
rename from testsuite/gras/mk_datadesc_structs.pl
rename to teshsuite/gras/mk_datadesc_structs.pl
diff --git a/teshsuite/gras/trp_file_client b/teshsuite/gras/trp_file_client
new file mode 100755
index 0000000000..d1db334f08
--- /dev/null
+++ b/teshsuite/gras/trp_file_client
@@ -0,0 +1,136 @@
+#! /bin/sh
+
+# gras/trp_file_client - temporary wrapper script for .libs/trp_file_client
+# Generated by ltmain.sh - GNU libtool 1.5.24 (1.1220.2.456 2007/06/24 02:25:32)
+#
+# The gras/trp_file_client program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='/bin/sed -e 1s/^X//'
+sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command="(cd /home/mquinson/CVSIMPORT/gras/gras/teshsuite; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LD_LIBRARY_PATH=\"/home/mquinson/CVSIMPORT/gras/install/lib\"; export LD_LIBRARY_PATH; PATH=\"/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games:/home/mquinson/SCRIPTS:/usr/sbin:/sbin:/home/mquinson/CVSIMPORT/gras/install/bin\"; export PATH; gcc -g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-strict-aliasing -Werror -g3 -o \$progdir/\$file trp_file_client.o  /home/mquinson/CVSIMPORT/gras/gras/src/.libs/libgras.so -lnsl -lm -lpthread  -Wl,--rpath -Wl,/home/mquinson/CVSIMPORT/gras/gras/src/.libs -Wl,--rpath -Wl,/home/mquinson/CVSIMPORT/gras/install//lib ) "
+
+# This environment variable determines our operation mode.
+if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
+  # install mode needs the following variable:
+  notinst_deplibs=' /home/mquinson/CVSIMPORT/gras/gras/src/libgras.la'
+else
+  # When we are sourced in execute mode, $file and $echo are already set.
+  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+    echo="echo"
+    file="$0"
+    # Make sure echo works.
+    if test "X$1" = X--no-reexec; then
+      # Discard the --no-reexec flag, and continue.
+      shift
+    elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+      # Yippee, $echo works!
+      :
+    else
+      # Restart under the correct shell, and then maybe $echo will work.
+      exec /bin/sh "$0" --no-reexec ${1+"$@"}
+    fi
+  fi
+
+  # Find the directory that this script lives in.
+  thisdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+  test "x$thisdir" = "x$file" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'`
+  while test -n "$file"; do
+    destdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+
+    # If there was a directory component, then change thisdir.
+    if test "x$destdir" != "x$file"; then
+      case "$destdir" in
+      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
+      *) thisdir="$thisdir/$destdir" ;;
+      esac
+    fi
+
+    file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+    file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'`
+  done
+
+  # Try to get the absolute directory name.
+  absdir=`cd "$thisdir" && pwd`
+  test -n "$absdir" && thisdir="$absdir"
+
+  program=lt-'trp_file_client'
+  progdir="$thisdir/.libs"
+
+  if test ! -f "$progdir/$program" || \
+     { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | /bin/sed 1q`; \
+       test "X$file" != "X$progdir/$program"; }; then
+
+    file="$$-$program"
+
+    if test ! -d "$progdir"; then
+      mkdir "$progdir"
+    else
+      rm -f "$progdir/$file"
+    fi
+
+    # relink executable if necessary
+    if test -n "$relink_command"; then
+      if relink_command_output=`eval $relink_command 2>&1`; then :
+      else
+	echo "$relink_command_output" >&2
+	rm -f "$progdir/$file"
+	exit 1
+      fi
+    fi
+
+    mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null ||
+    { rm -f "$progdir/$program";
+      mv -f "$progdir/$file" "$progdir/$program"; }
+    rm -f "$progdir/$file"
+  fi
+
+  if test -f "$progdir/$program"; then
+    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+      # Run the actual program with our arguments.
+
+      # Make sure env LD_LIBRARY_PATH does not mess us up
+      if test -n "${LD_LIBRARY_PATH+set}"; then
+        export LD_LIBRARY_PATH=$progdir:$LD_LIBRARY_PATH
+      fi
+
+      exec "$progdir/$program" ${1+"$@"}
+
+      $echo "$0: cannot exec $program $*"
+      exit 1
+    fi
+  else
+    # The program doesn't exist.
+    $echo "$0: error: \`$progdir/$program' does not exist" 1>&2
+    $echo "This script is just a wrapper for $program." 1>&2
+    echo "See the libtool documentation for more information." 1>&2
+    exit 1
+  fi
+fi
diff --git a/testsuite/gras/trp_file_client.c b/teshsuite/gras/trp_file_client.c
similarity index 100%
rename from testsuite/gras/trp_file_client.c
rename to teshsuite/gras/trp_file_client.c
diff --git a/testsuite/gras/trp_file_server.c b/teshsuite/gras/trp_file_server.c
similarity index 100%
rename from testsuite/gras/trp_file_server.c
rename to teshsuite/gras/trp_file_server.c
diff --git a/testsuite/gras/trp_file_usage.in b/teshsuite/gras/trp_file_usage.in
similarity index 100%
rename from testsuite/gras/trp_file_usage.in
rename to teshsuite/gras/trp_file_usage.in
diff --git a/teshsuite/gras/trp_file_usage.tesh b/teshsuite/gras/trp_file_usage.tesh
new file mode 100644
index 0000000000..7301ad8e48
--- /dev/null
+++ b/teshsuite/gras/trp_file_usage.tesh
@@ -0,0 +1,8 @@
+
+$ PATH=".:gras:$PATH" trp_file_server$EXEEXT
+
+$ sleep 1
+
+$ PATH=".:gras:$PATH" trp_file_client$EXEEXT
+
+
diff --git a/testsuite/gras/trp_tcp_client.c b/teshsuite/gras/trp_tcp_client.c
similarity index 100%
rename from testsuite/gras/trp_tcp_client.c
rename to teshsuite/gras/trp_tcp_client.c
diff --git a/testsuite/gras/trp_tcp_server.c b/teshsuite/gras/trp_tcp_server.c
similarity index 100%
rename from testsuite/gras/trp_tcp_server.c
rename to teshsuite/gras/trp_tcp_server.c
diff --git a/teshsuite/gras/trp_tcp_usage b/teshsuite/gras/trp_tcp_usage
new file mode 100755
index 0000000000..674d04f3c6
--- /dev/null
+++ b/teshsuite/gras/trp_tcp_usage
@@ -0,0 +1,18 @@
+#! /bin/sh -e
+
+if test -e gras/trp_tcp_server ; then
+  base=gras
+else 
+  base=.
+fi
+
+if [ x = x ] ; then 
+  wine=
+else
+  wine=wine
+fi
+
+$wine $base/trp_tcp_server $@ &
+sleep 1
+$wine $base/trp_tcp_client $@
+
diff --git a/testsuite/gras/trp_tcp_usage.in b/teshsuite/gras/trp_tcp_usage.in
similarity index 100%
rename from testsuite/gras/trp_tcp_usage.in
rename to teshsuite/gras/trp_tcp_usage.in
diff --git a/teshsuite/gras/trp_tcp_usage.tesh b/teshsuite/gras/trp_tcp_usage.tesh
new file mode 100644
index 0000000000..50d79acf86
--- /dev/null
+++ b/teshsuite/gras/trp_tcp_usage.tesh
@@ -0,0 +1,8 @@
+
+& PATH=".:gras:$PATH" trp_tcp_server$EXEEXT
+
+$ sleep 1
+
+$ PATH=".:gras:$PATH" trp_tcp_client$EXEEXT
+
+
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 38cefa96bc..b2e98d7d8c 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,24 +1,14 @@
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include
 AM_CFLAGS=-g
 
-CLEANFILES = *~ test a.out *.o gras/datadesc_usage.out datadesc_usage.out\
-  testgraph.xml testgraph.dot
+CLEANFILES = *~ test a.out *.o testgraph.xml testgraph.dot
 DISTCLEANFILES =  gras/.libs/* xbt/.libs/* surf/.libs/* msg/.libs/* simdag/.libs/*
 
 EXTRA_DIST=run_tests.in \
-  gras/datadesc.little32 gras/datadesc.little32_4 \
-  gras/datadesc.little64\
-  gras/datadesc.big32 gras/datadesc.big32_8_4 gras/datadesc.big32_2 \
-  gras/mk_datadesc_structs.pl \
   xbt/graph.xml \
   surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt surf/platform.xml\
   simdag/availability_tremblay.txt simdag/small_platform_variable.xml
   
-# Data sets still to regenerate:
-# gras/datadesc.big64 
-# gras/datadesc.big32_4 
-
-
 # Test stuff
 
 xbt_tests =                                                      \
@@ -27,18 +17,13 @@ xbt_tests =                                                      \
 	xbt/graphxml_usage                                       \
 	xbt/context_usage                                        
 
-RL_tests =                                              \
-	gras/trp_tcp_client   gras/trp_tcp_server       \
-	gras/trp_file_client  gras/trp_file_server      \
-	gras/datadesc_usage                             
-
 SG_tests =                                              \
 	surf/maxmin_bench surf/lmm_usage \
 	surf/trace_usage surf/surf_usage surf/surf_usage2
 
 simdag_tests = simdag/sd_test
 
-check_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests) $(simdag_tests)
+check_PROGRAMS = $(xbt_tests) $(SG_tests) $(simdag_tests)
 check_SCRIPTS = run_tests gras/trp_tcp_usage
 TESTS=run_tests
 
@@ -54,6 +39,7 @@ LDADD_RL=$(abs_top_builddir)/src/libgras.la
 xbt_log_usage_LDADD=          $(LDADD_RL)
 
 xbt_heap_bench_LDADD=         $(LDADD_RL)
+xbt_parallel_log_crashtest_LDADD=  $(LDADD_RL)
 
 xbt_graphxml_usage_LDADD=     $(LDADD_SG)
 
@@ -65,17 +51,6 @@ surf_trace_usage_LDADD=       $(LDADD_SG)
 surf_surf_usage_LDADD=        $(LDADD_SG)
 surf_surf_usage2_LDADD=       $(LDADD_SG)
 
-gras_trp_tcp_client_LDADD=     $(LDADD_RL)
-gras_trp_tcp_server_LDADD=     $(LDADD_RL)
-gras_trp_file_client_LDADD=    $(LDADD_RL)
-gras_trp_file_server_LDADD=    $(LDADD_RL)
-
-gras_datadesc_usage_SOURCES=   gras/datadesc_usage.c gras/datadesc_structs.c
-gras_datadesc_usage_LDADD=     $(LDADD_RL)
-
-gras/datadesc_structs.c: gras/mk_datadesc_structs.pl
-	cd gras ; perl ../$(top_srcdir)/testsuite/gras/mk_datadesc_structs.pl > datadesc_structs.c
-
 simdag_sd_test_LDADD=       $(LDADD_SG)
 
 include $(top_srcdir)/acmacro/dist-files.mk
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 7925396d96..77d178c5b8 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -37,8 +37,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
-	$(am__EXEEXT_4)
+check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/run_tests.in $(top_srcdir)/acmacro/dist-files.mk
 subdir = testsuite
@@ -58,33 +57,14 @@ CONFIG_HEADER = $(top_builddir)/src/gras_config.h
 CONFIG_CLEAN_FILES = run_tests
 am__EXEEXT_1 = xbt/log_usage$(EXEEXT) xbt/heap_bench$(EXEEXT) \
 	xbt/graphxml_usage$(EXEEXT) xbt/context_usage$(EXEEXT)
-am__EXEEXT_2 = gras/trp_tcp_client$(EXEEXT) \
-	gras/trp_tcp_server$(EXEEXT) gras/trp_file_client$(EXEEXT) \
-	gras/trp_file_server$(EXEEXT) gras/datadesc_usage$(EXEEXT)
-am__EXEEXT_3 = surf/maxmin_bench$(EXEEXT) surf/lmm_usage$(EXEEXT) \
+am__EXEEXT_2 = surf/maxmin_bench$(EXEEXT) surf/lmm_usage$(EXEEXT) \
 	surf/trace_usage$(EXEEXT) surf/surf_usage$(EXEEXT) \
 	surf/surf_usage2$(EXEEXT)
-am__EXEEXT_4 = simdag/sd_test$(EXEEXT)
-am_gras_datadesc_usage_OBJECTS = datadesc_usage.$(OBJEXT) \
-	datadesc_structs.$(OBJEXT)
-gras_datadesc_usage_OBJECTS = $(am_gras_datadesc_usage_OBJECTS)
-gras_datadesc_usage_DEPENDENCIES = $(LDADD_RL)
-am__dirstamp = $(am__leading_dot)dirstamp
-gras_trp_file_client_SOURCES = gras/trp_file_client.c
-gras_trp_file_client_OBJECTS = trp_file_client.$(OBJEXT)
-gras_trp_file_client_DEPENDENCIES = $(LDADD_RL)
-gras_trp_file_server_SOURCES = gras/trp_file_server.c
-gras_trp_file_server_OBJECTS = trp_file_server.$(OBJEXT)
-gras_trp_file_server_DEPENDENCIES = $(LDADD_RL)
-gras_trp_tcp_client_SOURCES = gras/trp_tcp_client.c
-gras_trp_tcp_client_OBJECTS = trp_tcp_client.$(OBJEXT)
-gras_trp_tcp_client_DEPENDENCIES = $(LDADD_RL)
-gras_trp_tcp_server_SOURCES = gras/trp_tcp_server.c
-gras_trp_tcp_server_OBJECTS = trp_tcp_server.$(OBJEXT)
-gras_trp_tcp_server_DEPENDENCIES = $(LDADD_RL)
+am__EXEEXT_3 = simdag/sd_test$(EXEEXT)
 simdag_sd_test_SOURCES = simdag/sd_test.c
 simdag_sd_test_OBJECTS = sd_test.$(OBJEXT)
 simdag_sd_test_DEPENDENCIES = $(LDADD_SG)
+am__dirstamp = $(am__leading_dot)dirstamp
 surf_lmm_usage_SOURCES = surf/lmm_usage.c
 surf_lmm_usage_OBJECTS = lmm_usage.$(OBJEXT)
 surf_lmm_usage_DEPENDENCIES = $(LDADD_SG)
@@ -124,18 +104,14 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(gras_datadesc_usage_SOURCES) gras/trp_file_client.c \
-	gras/trp_file_server.c gras/trp_tcp_client.c \
-	gras/trp_tcp_server.c simdag/sd_test.c surf/lmm_usage.c \
-	surf/maxmin_bench.c surf/surf_usage.c surf/surf_usage2.c \
-	surf/trace_usage.c xbt/context_usage.c xbt/graphxml_usage.c \
-	xbt/heap_bench.c xbt/log_usage.c
-DIST_SOURCES = $(gras_datadesc_usage_SOURCES) gras/trp_file_client.c \
-	gras/trp_file_server.c gras/trp_tcp_client.c \
-	gras/trp_tcp_server.c simdag/sd_test.c surf/lmm_usage.c \
-	surf/maxmin_bench.c surf/surf_usage.c surf/surf_usage2.c \
-	surf/trace_usage.c xbt/context_usage.c xbt/graphxml_usage.c \
-	xbt/heap_bench.c xbt/log_usage.c
+SOURCES = simdag/sd_test.c surf/lmm_usage.c surf/maxmin_bench.c \
+	surf/surf_usage.c surf/surf_usage2.c surf/trace_usage.c \
+	xbt/context_usage.c xbt/graphxml_usage.c xbt/heap_bench.c \
+	xbt/log_usage.c
+DIST_SOURCES = simdag/sd_test.c surf/lmm_usage.c surf/maxmin_bench.c \
+	surf/surf_usage.c surf/surf_usage2.c surf/trace_usage.c \
+	xbt/context_usage.c xbt/graphxml_usage.c xbt/heap_bench.c \
+	xbt/log_usage.c
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -209,7 +185,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PTH_STACK_GROWTH = @PTH_STACK_GROWTH@
 RANLIB = @RANLIB@
-SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIMGRID_DEP = @SIMGRID_DEP@
@@ -277,24 +252,14 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include
 AM_CFLAGS = -g
-CLEANFILES = *~ test a.out *.o gras/datadesc_usage.out datadesc_usage.out\
-  testgraph.xml testgraph.dot
-
+CLEANFILES = *~ test a.out *.o testgraph.xml testgraph.dot
 DISTCLEANFILES = gras/.libs/* xbt/.libs/* surf/.libs/* msg/.libs/* simdag/.libs/*
 EXTRA_DIST = run_tests.in \
-  gras/datadesc.little32 gras/datadesc.little32_4 \
-  gras/datadesc.little64\
-  gras/datadesc.big32 gras/datadesc.big32_8_4 gras/datadesc.big32_2 \
-  gras/mk_datadesc_structs.pl \
   xbt/graph.xml \
   surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt surf/platform.xml\
   simdag/availability_tremblay.txt simdag/small_platform_variable.xml
 
 
-# Data sets still to regenerate:
-# gras/datadesc.big64 
-# gras/datadesc.big32_4 
-
 # Test stuff
 xbt_tests = \
 	xbt/log_usage                                            \
@@ -302,11 +267,6 @@ xbt_tests = \
 	xbt/graphxml_usage                                       \
 	xbt/context_usage                                        
 
-RL_tests = \
-	gras/trp_tcp_client   gras/trp_tcp_server       \
-	gras/trp_file_client  gras/trp_file_server      \
-	gras/datadesc_usage                             
-
 SG_tests = \
 	surf/maxmin_bench surf/lmm_usage \
 	surf/trace_usage surf/surf_usage surf/surf_usage2
@@ -320,6 +280,7 @@ LDADD_SG = $(abs_top_builddir)/src/libsimgrid.la
 LDADD_RL = $(abs_top_builddir)/src/libgras.la   
 xbt_log_usage_LDADD = $(LDADD_RL)
 xbt_heap_bench_LDADD = $(LDADD_RL)
+xbt_parallel_log_crashtest_LDADD = $(LDADD_RL)
 xbt_graphxml_usage_LDADD = $(LDADD_SG)
 xbt_context_usage_LDADD = $(LDADD_SG)
 surf_maxmin_bench_LDADD = $(LDADD_SG)
@@ -327,12 +288,6 @@ surf_lmm_usage_LDADD = $(LDADD_SG)
 surf_trace_usage_LDADD = $(LDADD_SG)
 surf_surf_usage_LDADD = $(LDADD_SG)
 surf_surf_usage2_LDADD = $(LDADD_SG)
-gras_trp_tcp_client_LDADD = $(LDADD_RL)
-gras_trp_tcp_server_LDADD = $(LDADD_RL)
-gras_trp_file_client_LDADD = $(LDADD_RL)
-gras_trp_file_server_LDADD = $(LDADD_RL)
-gras_datadesc_usage_SOURCES = gras/datadesc_usage.c gras/datadesc_structs.c
-gras_datadesc_usage_LDADD = $(LDADD_RL)
 simdag_sd_test_LDADD = $(LDADD_SG)
 all: all-am
 
@@ -376,24 +331,6 @@ clean-checkPROGRAMS:
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
-gras/$(am__dirstamp):
-	@$(MKDIR_P) gras
-	@: > gras/$(am__dirstamp)
-gras/datadesc_usage$(EXEEXT): $(gras_datadesc_usage_OBJECTS) $(gras_datadesc_usage_DEPENDENCIES) gras/$(am__dirstamp)
-	@rm -f gras/datadesc_usage$(EXEEXT)
-	$(LINK) $(gras_datadesc_usage_OBJECTS) $(gras_datadesc_usage_LDADD) $(LIBS)
-gras/trp_file_client$(EXEEXT): $(gras_trp_file_client_OBJECTS) $(gras_trp_file_client_DEPENDENCIES) gras/$(am__dirstamp)
-	@rm -f gras/trp_file_client$(EXEEXT)
-	$(LINK) $(gras_trp_file_client_OBJECTS) $(gras_trp_file_client_LDADD) $(LIBS)
-gras/trp_file_server$(EXEEXT): $(gras_trp_file_server_OBJECTS) $(gras_trp_file_server_DEPENDENCIES) gras/$(am__dirstamp)
-	@rm -f gras/trp_file_server$(EXEEXT)
-	$(LINK) $(gras_trp_file_server_OBJECTS) $(gras_trp_file_server_LDADD) $(LIBS)
-gras/trp_tcp_client$(EXEEXT): $(gras_trp_tcp_client_OBJECTS) $(gras_trp_tcp_client_DEPENDENCIES) gras/$(am__dirstamp)
-	@rm -f gras/trp_tcp_client$(EXEEXT)
-	$(LINK) $(gras_trp_tcp_client_OBJECTS) $(gras_trp_tcp_client_LDADD) $(LIBS)
-gras/trp_tcp_server$(EXEEXT): $(gras_trp_tcp_server_OBJECTS) $(gras_trp_tcp_server_DEPENDENCIES) gras/$(am__dirstamp)
-	@rm -f gras/trp_tcp_server$(EXEEXT)
-	$(LINK) $(gras_trp_tcp_server_OBJECTS) $(gras_trp_tcp_server_LDADD) $(LIBS)
 simdag/$(am__dirstamp):
 	@$(MKDIR_P) simdag
 	@: > simdag/$(am__dirstamp)
@@ -441,8 +378,6 @@ distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/context_usage.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/datadesc_structs.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/datadesc_usage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphxml_usage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heap_bench.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmm_usage.Po@am__quote@
@@ -452,10 +387,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/surf_usage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/surf_usage2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trace_usage.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trp_file_client.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trp_file_server.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trp_tcp_client.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trp_tcp_server.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -478,90 +409,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-datadesc_usage.o: gras/datadesc_usage.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT datadesc_usage.o -MD -MP -MF $(DEPDIR)/datadesc_usage.Tpo -c -o datadesc_usage.o `test -f 'gras/datadesc_usage.c' || echo '$(srcdir)/'`gras/datadesc_usage.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/datadesc_usage.Tpo $(DEPDIR)/datadesc_usage.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/datadesc_usage.c' object='datadesc_usage.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o datadesc_usage.o `test -f 'gras/datadesc_usage.c' || echo '$(srcdir)/'`gras/datadesc_usage.c
-
-datadesc_usage.obj: gras/datadesc_usage.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT datadesc_usage.obj -MD -MP -MF $(DEPDIR)/datadesc_usage.Tpo -c -o datadesc_usage.obj `if test -f 'gras/datadesc_usage.c'; then $(CYGPATH_W) 'gras/datadesc_usage.c'; else $(CYGPATH_W) '$(srcdir)/gras/datadesc_usage.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/datadesc_usage.Tpo $(DEPDIR)/datadesc_usage.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/datadesc_usage.c' object='datadesc_usage.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o datadesc_usage.obj `if test -f 'gras/datadesc_usage.c'; then $(CYGPATH_W) 'gras/datadesc_usage.c'; else $(CYGPATH_W) '$(srcdir)/gras/datadesc_usage.c'; fi`
-
-datadesc_structs.o: gras/datadesc_structs.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT datadesc_structs.o -MD -MP -MF $(DEPDIR)/datadesc_structs.Tpo -c -o datadesc_structs.o `test -f 'gras/datadesc_structs.c' || echo '$(srcdir)/'`gras/datadesc_structs.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/datadesc_structs.Tpo $(DEPDIR)/datadesc_structs.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/datadesc_structs.c' object='datadesc_structs.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o datadesc_structs.o `test -f 'gras/datadesc_structs.c' || echo '$(srcdir)/'`gras/datadesc_structs.c
-
-datadesc_structs.obj: gras/datadesc_structs.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT datadesc_structs.obj -MD -MP -MF $(DEPDIR)/datadesc_structs.Tpo -c -o datadesc_structs.obj `if test -f 'gras/datadesc_structs.c'; then $(CYGPATH_W) 'gras/datadesc_structs.c'; else $(CYGPATH_W) '$(srcdir)/gras/datadesc_structs.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/datadesc_structs.Tpo $(DEPDIR)/datadesc_structs.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/datadesc_structs.c' object='datadesc_structs.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o datadesc_structs.obj `if test -f 'gras/datadesc_structs.c'; then $(CYGPATH_W) 'gras/datadesc_structs.c'; else $(CYGPATH_W) '$(srcdir)/gras/datadesc_structs.c'; fi`
-
-trp_file_client.o: gras/trp_file_client.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trp_file_client.o -MD -MP -MF $(DEPDIR)/trp_file_client.Tpo -c -o trp_file_client.o `test -f 'gras/trp_file_client.c' || echo '$(srcdir)/'`gras/trp_file_client.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/trp_file_client.Tpo $(DEPDIR)/trp_file_client.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/trp_file_client.c' object='trp_file_client.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trp_file_client.o `test -f 'gras/trp_file_client.c' || echo '$(srcdir)/'`gras/trp_file_client.c
-
-trp_file_client.obj: gras/trp_file_client.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trp_file_client.obj -MD -MP -MF $(DEPDIR)/trp_file_client.Tpo -c -o trp_file_client.obj `if test -f 'gras/trp_file_client.c'; then $(CYGPATH_W) 'gras/trp_file_client.c'; else $(CYGPATH_W) '$(srcdir)/gras/trp_file_client.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/trp_file_client.Tpo $(DEPDIR)/trp_file_client.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/trp_file_client.c' object='trp_file_client.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trp_file_client.obj `if test -f 'gras/trp_file_client.c'; then $(CYGPATH_W) 'gras/trp_file_client.c'; else $(CYGPATH_W) '$(srcdir)/gras/trp_file_client.c'; fi`
-
-trp_file_server.o: gras/trp_file_server.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trp_file_server.o -MD -MP -MF $(DEPDIR)/trp_file_server.Tpo -c -o trp_file_server.o `test -f 'gras/trp_file_server.c' || echo '$(srcdir)/'`gras/trp_file_server.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/trp_file_server.Tpo $(DEPDIR)/trp_file_server.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/trp_file_server.c' object='trp_file_server.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trp_file_server.o `test -f 'gras/trp_file_server.c' || echo '$(srcdir)/'`gras/trp_file_server.c
-
-trp_file_server.obj: gras/trp_file_server.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trp_file_server.obj -MD -MP -MF $(DEPDIR)/trp_file_server.Tpo -c -o trp_file_server.obj `if test -f 'gras/trp_file_server.c'; then $(CYGPATH_W) 'gras/trp_file_server.c'; else $(CYGPATH_W) '$(srcdir)/gras/trp_file_server.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/trp_file_server.Tpo $(DEPDIR)/trp_file_server.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/trp_file_server.c' object='trp_file_server.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trp_file_server.obj `if test -f 'gras/trp_file_server.c'; then $(CYGPATH_W) 'gras/trp_file_server.c'; else $(CYGPATH_W) '$(srcdir)/gras/trp_file_server.c'; fi`
-
-trp_tcp_client.o: gras/trp_tcp_client.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trp_tcp_client.o -MD -MP -MF $(DEPDIR)/trp_tcp_client.Tpo -c -o trp_tcp_client.o `test -f 'gras/trp_tcp_client.c' || echo '$(srcdir)/'`gras/trp_tcp_client.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/trp_tcp_client.Tpo $(DEPDIR)/trp_tcp_client.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/trp_tcp_client.c' object='trp_tcp_client.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trp_tcp_client.o `test -f 'gras/trp_tcp_client.c' || echo '$(srcdir)/'`gras/trp_tcp_client.c
-
-trp_tcp_client.obj: gras/trp_tcp_client.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trp_tcp_client.obj -MD -MP -MF $(DEPDIR)/trp_tcp_client.Tpo -c -o trp_tcp_client.obj `if test -f 'gras/trp_tcp_client.c'; then $(CYGPATH_W) 'gras/trp_tcp_client.c'; else $(CYGPATH_W) '$(srcdir)/gras/trp_tcp_client.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/trp_tcp_client.Tpo $(DEPDIR)/trp_tcp_client.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/trp_tcp_client.c' object='trp_tcp_client.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trp_tcp_client.obj `if test -f 'gras/trp_tcp_client.c'; then $(CYGPATH_W) 'gras/trp_tcp_client.c'; else $(CYGPATH_W) '$(srcdir)/gras/trp_tcp_client.c'; fi`
-
-trp_tcp_server.o: gras/trp_tcp_server.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trp_tcp_server.o -MD -MP -MF $(DEPDIR)/trp_tcp_server.Tpo -c -o trp_tcp_server.o `test -f 'gras/trp_tcp_server.c' || echo '$(srcdir)/'`gras/trp_tcp_server.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/trp_tcp_server.Tpo $(DEPDIR)/trp_tcp_server.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/trp_tcp_server.c' object='trp_tcp_server.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trp_tcp_server.o `test -f 'gras/trp_tcp_server.c' || echo '$(srcdir)/'`gras/trp_tcp_server.c
-
-trp_tcp_server.obj: gras/trp_tcp_server.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT trp_tcp_server.obj -MD -MP -MF $(DEPDIR)/trp_tcp_server.Tpo -c -o trp_tcp_server.obj `if test -f 'gras/trp_tcp_server.c'; then $(CYGPATH_W) 'gras/trp_tcp_server.c'; else $(CYGPATH_W) '$(srcdir)/gras/trp_tcp_server.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/trp_tcp_server.Tpo $(DEPDIR)/trp_tcp_server.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gras/trp_tcp_server.c' object='trp_tcp_server.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trp_tcp_server.obj `if test -f 'gras/trp_tcp_server.c'; then $(CYGPATH_W) 'gras/trp_tcp_server.c'; else $(CYGPATH_W) '$(srcdir)/gras/trp_tcp_server.c'; fi`
-
 sd_test.o: simdag/sd_test.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sd_test.o -MD -MP -MF $(DEPDIR)/sd_test.Tpo -c -o sd_test.o `test -f 'simdag/sd_test.c' || echo '$(srcdir)/'`simdag/sd_test.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/sd_test.Tpo $(DEPDIR)/sd_test.Po
@@ -882,7 +729,6 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-rm -f gras/$(am__dirstamp)
 	-rm -f simdag/$(am__dirstamp)
 	-rm -f surf/$(am__dirstamp)
 	-rm -f xbt/$(am__dirstamp)
@@ -972,9 +818,6 @@ test: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
 valgrind: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
 	./run_tests valgrind
 
-gras/datadesc_structs.c: gras/mk_datadesc_structs.pl
-	cd gras ; perl ../$(top_srcdir)/testsuite/gras/mk_datadesc_structs.pl > datadesc_structs.c
-
 dist-files:
 	@for n in $(DISTFILES) ; do echo $(SRCFILE)$$n; done
 	@echo
diff --git a/testsuite/run_tests.in b/testsuite/run_tests.in
index f7ae110de1..6b7e999a44 100755
--- a/testsuite/run_tests.in
+++ b/testsuite/run_tests.in
@@ -42,25 +42,10 @@ surf_TESTS="surf/lmm_usage@EXEEXT@;                                        \
 	    surf/surf_usage@EXEEXT@  --surf-path=@srcdir@/surf/ platform.xml; \
 	    surf/surf_usage2@EXEEXT@ --surf-path=@srcdir@/surf/ platform.xml;"
 
-gras_TESTS="gras/trp_tcp_usage;      gras/trp_file_usage;                        \
-	    gras/datadesc_usage@EXEEXT@;                                         \
-	    gras/datadesc_usage@EXEEXT@ --copy;                                  \
-            gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.little32;  \
-	    gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.little64;"
-
-# 	    gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.little32_4;\
-#	    gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.big32;     \
-#	    gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.big32_8_4; \
-#	    gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.big32_2;
-
 simdag_TESTS="simdag/sd_test --surf-path=@srcdir@/simdag @srcdir@/simdag/small_platform_variable.xml; \
               simdag/sd_test @top_srcdir@/examples/msg/small_platform.xml; \
               simdag/sd_test @top_srcdir@/examples/msg/msg_platform.xml; "
 
-# Data sets still to regenerate:
-#
-#	    gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.big32_4;   \
-#	    gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.big64;"    
 
 ##
 ## Loop on all tests to run them
@@ -69,7 +54,7 @@ simdag_TESTS="simdag/sd_test --surf-path=@srcdir@/simdag @srcdir@/simdag/small_p
 # we split tests on ';' so that they can contain spaces (test=accumulator)
 test=""
 
-for testpart in $xbt_TESTS $gras_TESTS $surf_TESTS $simdag_TESTS
+for testpart in $xbt_TESTS $surf_TESTS $simdag_TESTS
 do
   test="$test $testpart"
   if echo $test | grep  ';' >/dev/null ; then
-- 
2.20.1