Second step in putting the datadesc tests into their own directory

[simgrid.git] / teshsuite / Makefile.am

diff --git a/teshsuite/Makefile.am b/teshsuite/Makefile.am
index 7e306ca..5c92ce8 100644 (file)
--- a/teshsuite/Makefile.am
+++ b/teshsuite/Makefile.am
@@ -2,36 +2,36 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/inclu
 AM_CFLAGS = -g
 
 
-CLEANFILES = gras/datadesc_usage.out datadesc_usage.out
+CLEANFILES = gras/datadesc/datadesc_usage.out datadesc_usage.out
 EXTRA_DIST= \
-  gras/datadesc.little32_4 \
-  gras/datadesc.little64\
-  gras/datadesc.big32_8 gras/datadesc.big32_8_4 gras/datadesc.big32_2 \
-  gras/mk_datadesc_structs.pl
+  gras/datadesc/datadesc.little32_4 \
+  gras/datadesc/datadesc.little64\
+  gras/datadesc/datadesc.big32_8 gras/datadesc/datadesc.big32_8_4 gras/datadesc/datadesc.big32_2 \
+  gras/datadesc/mk_datadesc_structs.pl
   
 
 TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh
 TESTS = xbt/parallel_log_crashtest.tesh     \
-       gras/datadesc_mem.tesh          \
-       gras/datadesc_rw.tesh           \
-       gras/datadesc_r_little32_4.tesh \
-       gras/datadesc_r_little64.tesh   \
+       gras/datadesc/datadesc_mem.tesh          \
+       gras/datadesc/datadesc_rw.tesh           \
+       gras/datadesc/datadesc_r_little32_4.tesh \
+       gras/datadesc/datadesc_r_little64.tesh   \
        \
-        gras/datadesc_r_big32_8.tesh      \
-       gras/datadesc_r_big32_8_4.tesh  \
-       gras/datadesc_r_big32_2.tesh
+        gras/datadesc/datadesc_r_big32_8.tesh      \
+       gras/datadesc/datadesc_r_big32_8_4.tesh  \
+       gras/datadesc/datadesc_r_big32_2.tesh
 
 # Data sets still to regenerate:
 XFAIL_TESTS= \
-       gras/datadesc_r_little32.tesh   \
-        gras/datadesc_r_big32_8.tesh      \
-       gras/datadesc_r_big32_8_4.tesh  \
-       gras/datadesc_r_big32_2.tesh
+       gras/datadesc/datadesc_r_little32.tesh   \
+        gras/datadesc/datadesc_r_big32_8.tesh      \
+       gras/datadesc/datadesc_r_big32_8_4.tesh  \
+       gras/datadesc/datadesc_r_big32_2.tesh
 
 noinst_PROGRAMS = \
        xbt/parallel_log_crashtest \
        \
-       gras/datadesc_usage   
+       gras/datadesc/datadesc_usage   
                               
 LDADD_SG=$(abs_top_builddir)/src/libsimgrid.la
 LDADD_RL=$(abs_top_builddir)/src/libgras.la
@@ -40,11 +40,11 @@ LDADD_RL=$(abs_top_builddir)/src/libgras.la
 xbt_parallel_log_crashtest_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_datadesc_usage_SOURCES=   gras/datadesc/datadesc_usage.c gras/datadesc/datadesc_structs.c
+gras_datadesc_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
+gras/datadesc/datadesc_structs.c: gras/datadesc/mk_datadesc_structs.pl
+       cd gras/datadesc ; perl ../$(top_srcdir)/teshsuite/gras/datadesc/mk_datadesc_structs.pl > datadesc_structs.c
 
 
 include $(top_srcdir)/acmacro/dist-files.mk