From e9c1fd56cd9427e5bed6fae50797831cba842cb7 Mon Sep 17 00:00:00 2001 From: mquinson Date: Thu, 13 Sep 2007 08:06:22 +0000 Subject: [PATCH] Second step in putting the datadesc tests into their own directory git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4613 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- teshsuite/Makefile.am | 42 ++++---- teshsuite/Makefile.in | 100 +++++++++--------- .../datadesc}/datadesc.big32_2 | Bin .../datadesc}/datadesc.big32_8 | Bin .../datadesc}/datadesc.big32_8_4 | Bin .../datadesc}/datadesc.big64 | Bin .../datadesc}/datadesc.little32_4 | Bin .../datadesc}/datadesc.little64 | Bin .../datadesc}/datadesc_mem.tesh | 2 +- .../datadesc}/datadesc_r_big32_2.tesh | 2 +- .../datadesc}/datadesc_r_big32_8.tesh | 2 +- .../datadesc}/datadesc_r_big32_8_4.tesh | 2 +- .../datadesc}/datadesc_r_little32_4.tesh | 2 +- .../datadesc}/datadesc_r_little64.tesh | 2 +- .../datadesc}/datadesc_rw.tesh | 2 +- .../datadesc}/datadesc_structs.c | 0 .../datadesc}/datadesc_usage.c | 0 .../datadesc}/mk_datadesc_structs.pl | 0 18 files changed, 79 insertions(+), 77 deletions(-) rename teshsuite/{gras_datadesc => gras/datadesc}/datadesc.big32_2 (100%) rename teshsuite/{gras_datadesc => gras/datadesc}/datadesc.big32_8 (100%) rename teshsuite/{gras_datadesc => gras/datadesc}/datadesc.big32_8_4 (100%) rename teshsuite/{gras_datadesc => gras/datadesc}/datadesc.big64 (100%) rename teshsuite/{gras_datadesc => gras/datadesc}/datadesc.little32_4 (100%) rename teshsuite/{gras_datadesc => gras/datadesc}/datadesc.little64 (100%) rename teshsuite/{gras_datadesc => gras/datadesc}/datadesc_mem.tesh (93%) rename teshsuite/{gras_datadesc => gras/datadesc}/datadesc_r_big32_2.tesh (89%) rename teshsuite/{gras_datadesc => gras/datadesc}/datadesc_r_big32_8.tesh (89%) rename teshsuite/{gras_datadesc => gras/datadesc}/datadesc_r_big32_8_4.tesh (89%) rename teshsuite/{gras_datadesc => gras/datadesc}/datadesc_r_little32_4.tesh (89%) rename teshsuite/{gras_datadesc => gras/datadesc}/datadesc_r_little64.tesh (89%) rename teshsuite/{gras_datadesc => gras/datadesc}/datadesc_rw.tesh (94%) rename teshsuite/{gras_datadesc => gras/datadesc}/datadesc_structs.c (100%) rename teshsuite/{gras_datadesc => gras/datadesc}/datadesc_usage.c (100%) rename teshsuite/{gras_datadesc => gras/datadesc}/mk_datadesc_structs.pl (100%) diff --git a/teshsuite/Makefile.am b/teshsuite/Makefile.am index 7e306cafc5..5c92ce8d9e 100644 --- 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 diff --git a/teshsuite/Makefile.in b/teshsuite/Makefile.in index 4f776a8148..49c5b5906d 100644 --- a/teshsuite/Makefile.in +++ b/teshsuite/Makefile.in @@ -39,7 +39,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ noinst_PROGRAMS = xbt/parallel_log_crashtest$(EXEEXT) \ - gras/datadesc_usage$(EXEEXT) + gras/datadesc/datadesc_usage$(EXEEXT) DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/acmacro/dist-files.mk subdir = teshsuite @@ -58,10 +58,11 @@ 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) \ +am_gras_datadesc_datadesc_usage_OBJECTS = datadesc_usage.$(OBJEXT) \ datadesc_structs.$(OBJEXT) -gras_datadesc_usage_OBJECTS = $(am_gras_datadesc_usage_OBJECTS) -gras_datadesc_usage_DEPENDENCIES = $(LDADD_RL) +gras_datadesc_datadesc_usage_OBJECTS = \ + $(am_gras_datadesc_datadesc_usage_OBJECTS) +gras_datadesc_datadesc_usage_DEPENDENCIES = $(LDADD_RL) am__dirstamp = $(am__leading_dot)dirstamp xbt_parallel_log_crashtest_SOURCES = xbt/parallel_log_crashtest.c xbt_parallel_log_crashtest_OBJECTS = parallel_log_crashtest.$(OBJEXT) @@ -78,8 +79,9 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(gras_datadesc_usage_SOURCES) xbt/parallel_log_crashtest.c -DIST_SOURCES = $(gras_datadesc_usage_SOURCES) \ +SOURCES = $(gras_datadesc_datadesc_usage_SOURCES) \ + xbt/parallel_log_crashtest.c +DIST_SOURCES = $(gras_datadesc_datadesc_usage_SOURCES) \ xbt/parallel_log_crashtest.c ETAGS = etags CTAGS = ctags @@ -221,31 +223,31 @@ 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 = 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 LDADD_SG = $(abs_top_builddir)/src/libsimgrid.la LDADD_RL = $(abs_top_builddir)/src/libgras.la @@ -254,8 +256,8 @@ 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) all: all-am .SUFFIXES: @@ -296,12 +298,12 @@ 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/datadesc/$(am__dirstamp): + @$(MKDIR_P) gras/datadesc + @: > gras/datadesc/$(am__dirstamp) +gras/datadesc/datadesc_usage$(EXEEXT): $(gras_datadesc_datadesc_usage_OBJECTS) $(gras_datadesc_datadesc_usage_DEPENDENCIES) gras/datadesc/$(am__dirstamp) + @rm -f gras/datadesc/datadesc_usage$(EXEEXT) + $(LINK) $(gras_datadesc_datadesc_usage_OBJECTS) $(gras_datadesc_datadesc_usage_LDADD) $(LIBS) xbt/$(am__dirstamp): @$(MKDIR_P) xbt @: > xbt/$(am__dirstamp) @@ -340,33 +342,33 @@ 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 +datadesc_usage.o: gras/datadesc/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/datadesc_usage.c' || echo '$(srcdir)/'`gras/datadesc/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@ source='gras/datadesc/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 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o datadesc_usage.o `test -f 'gras/datadesc/datadesc_usage.c' || echo '$(srcdir)/'`gras/datadesc/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` +datadesc_usage.obj: gras/datadesc/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/datadesc_usage.c'; then $(CYGPATH_W) 'gras/datadesc/datadesc_usage.c'; else $(CYGPATH_W) '$(srcdir)/gras/datadesc/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@ source='gras/datadesc/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` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o datadesc_usage.obj `if test -f 'gras/datadesc/datadesc_usage.c'; then $(CYGPATH_W) 'gras/datadesc/datadesc_usage.c'; else $(CYGPATH_W) '$(srcdir)/gras/datadesc/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 +datadesc_structs.o: gras/datadesc/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/datadesc_structs.c' || echo '$(srcdir)/'`gras/datadesc/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@ source='gras/datadesc/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 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o datadesc_structs.o `test -f 'gras/datadesc/datadesc_structs.c' || echo '$(srcdir)/'`gras/datadesc/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` +datadesc_structs.obj: gras/datadesc/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/datadesc_structs.c'; then $(CYGPATH_W) 'gras/datadesc/datadesc_structs.c'; else $(CYGPATH_W) '$(srcdir)/gras/datadesc/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@ source='gras/datadesc/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` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o datadesc_structs.obj `if test -f 'gras/datadesc/datadesc_structs.c'; then $(CYGPATH_W) 'gras/datadesc/datadesc_structs.c'; else $(CYGPATH_W) '$(srcdir)/gras/datadesc/datadesc_structs.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 @@ -561,7 +563,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -rm -f gras/$(am__dirstamp) + -rm -f gras/datadesc/$(am__dirstamp) -rm -f xbt/$(am__dirstamp) maintainer-clean-generic: @@ -643,8 +645,8 @@ 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 +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 dist-files: @for n in $(DISTFILES) ; do echo $(SRCFILE)$$n; done diff --git a/teshsuite/gras_datadesc/datadesc.big32_2 b/teshsuite/gras/datadesc/datadesc.big32_2 similarity index 100% rename from teshsuite/gras_datadesc/datadesc.big32_2 rename to teshsuite/gras/datadesc/datadesc.big32_2 diff --git a/teshsuite/gras_datadesc/datadesc.big32_8 b/teshsuite/gras/datadesc/datadesc.big32_8 similarity index 100% rename from teshsuite/gras_datadesc/datadesc.big32_8 rename to teshsuite/gras/datadesc/datadesc.big32_8 diff --git a/teshsuite/gras_datadesc/datadesc.big32_8_4 b/teshsuite/gras/datadesc/datadesc.big32_8_4 similarity index 100% rename from teshsuite/gras_datadesc/datadesc.big32_8_4 rename to teshsuite/gras/datadesc/datadesc.big32_8_4 diff --git a/teshsuite/gras_datadesc/datadesc.big64 b/teshsuite/gras/datadesc/datadesc.big64 similarity index 100% rename from teshsuite/gras_datadesc/datadesc.big64 rename to teshsuite/gras/datadesc/datadesc.big64 diff --git a/teshsuite/gras_datadesc/datadesc.little32_4 b/teshsuite/gras/datadesc/datadesc.little32_4 similarity index 100% rename from teshsuite/gras_datadesc/datadesc.little32_4 rename to teshsuite/gras/datadesc/datadesc.little32_4 diff --git a/teshsuite/gras_datadesc/datadesc.little64 b/teshsuite/gras/datadesc/datadesc.little64 similarity index 100% rename from teshsuite/gras_datadesc/datadesc.little64 rename to teshsuite/gras/datadesc/datadesc.little64 diff --git a/teshsuite/gras_datadesc/datadesc_mem.tesh b/teshsuite/gras/datadesc/datadesc_mem.tesh similarity index 93% rename from teshsuite/gras_datadesc/datadesc_mem.tesh rename to teshsuite/gras/datadesc/datadesc_mem.tesh index 8e2a0e3a0f..ea33932a5b 100644 --- a/teshsuite/gras_datadesc/datadesc_mem.tesh +++ b/teshsuite/gras/datadesc/datadesc_mem.tesh @@ -1,6 +1,6 @@ p Check the marshaling facilities (trying to to do a in-memory copy) -$ gras/datadesc_usage --copy --log=root.fmt:%m%n +$ gras/datadesc/datadesc_usage --copy --log=root.fmt:%m%n > ---- Test on integer ---- > ---- Test on float ---- > ---- Test on double ---- diff --git a/teshsuite/gras_datadesc/datadesc_r_big32_2.tesh b/teshsuite/gras/datadesc/datadesc_r_big32_2.tesh similarity index 89% rename from teshsuite/gras_datadesc/datadesc_r_big32_2.tesh rename to teshsuite/gras/datadesc/datadesc_r_big32_2.tesh index bc8c9362cb..7c2674f2d5 100644 --- a/teshsuite/gras_datadesc/datadesc_r_big32_2.tesh +++ b/teshsuite/gras/datadesc/datadesc_r_big32_2.tesh @@ -1,6 +1,6 @@ p Check the marshaling facilities (trying to read the result of linux/mips?) -$ gras/datadesc_usage --read ${srcdir:=.}/gras/datadesc.big32_2 --log=root.fmt:%m%n +$ gras/datadesc/datadesc_usage --read ${srcdir:=.}/gras/datadesc/datadesc.big32_2 --log=root.fmt:%m%n > This datafile was generated on big32_2 (8). > ---- Test on integer ---- > ---- Test on float ---- diff --git a/teshsuite/gras_datadesc/datadesc_r_big32_8.tesh b/teshsuite/gras/datadesc/datadesc_r_big32_8.tesh similarity index 89% rename from teshsuite/gras_datadesc/datadesc_r_big32_8.tesh rename to teshsuite/gras/datadesc/datadesc_r_big32_8.tesh index 3410675d80..523f687f5e 100644 --- a/teshsuite/gras_datadesc/datadesc_r_big32_8.tesh +++ b/teshsuite/gras/datadesc/datadesc_r_big32_8.tesh @@ -1,6 +1,6 @@ p Check the marshaling facilities (trying to read the result of ppc or sparc) -$ gras/datadesc_usage --read ${srcdir:=.}/gras/datadesc.big32_8 --log=root.fmt:%m%n +$ gras/datadesc/datadesc_usage --read ${srcdir:=.}/gras/datadesc/datadesc.big32_8 --log=root.fmt:%m%n > This datafile was generated on big32_8 (5). > ---- Test on integer ---- > ---- Test on float ---- diff --git a/teshsuite/gras_datadesc/datadesc_r_big32_8_4.tesh b/teshsuite/gras/datadesc/datadesc_r_big32_8_4.tesh similarity index 89% rename from teshsuite/gras_datadesc/datadesc_r_big32_8_4.tesh rename to teshsuite/gras/datadesc/datadesc_r_big32_8_4.tesh index c01a005940..d9773f2284 100644 --- a/teshsuite/gras_datadesc/datadesc_r_big32_8_4.tesh +++ b/teshsuite/gras/datadesc/datadesc_r_big32_8_4.tesh @@ -1,6 +1,6 @@ p Check the marshaling facilities (trying to read the result of AIX) -$ gras/datadesc_usage --read ${srcdir:=.}/gras/datadesc.big32_8_4 --log=root.fmt:%m%n +$ gras/datadesc/datadesc_usage --read ${srcdir:=.}/gras/datadesc/datadesc.big32_8_4 --log=root.fmt:%m%n > This datafile was generated on big32_8_4 (6). > ---- Test on integer ---- > ---- Test on float ---- diff --git a/teshsuite/gras_datadesc/datadesc_r_little32_4.tesh b/teshsuite/gras/datadesc/datadesc_r_little32_4.tesh similarity index 89% rename from teshsuite/gras_datadesc/datadesc_r_little32_4.tesh rename to teshsuite/gras/datadesc/datadesc_r_little32_4.tesh index 6c535e111e..fc98c48d26 100644 --- a/teshsuite/gras_datadesc/datadesc_r_little32_4.tesh +++ b/teshsuite/gras/datadesc/datadesc_r_little32_4.tesh @@ -1,6 +1,6 @@ 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 +$ gras/datadesc/datadesc_usage --read ${srcdir:=.}/gras/datadesc/datadesc.little32_4 --log=root.fmt:%m%n > This datafile was generated on little32_4 (2). > ---- Test on integer ---- > ---- Test on float ---- diff --git a/teshsuite/gras_datadesc/datadesc_r_little64.tesh b/teshsuite/gras/datadesc/datadesc_r_little64.tesh similarity index 89% rename from teshsuite/gras_datadesc/datadesc_r_little64.tesh rename to teshsuite/gras/datadesc/datadesc_r_little64.tesh index 2d9698820f..c037fe3c95 100644 --- a/teshsuite/gras_datadesc/datadesc_r_little64.tesh +++ b/teshsuite/gras/datadesc/datadesc_r_little64.tesh @@ -1,6 +1,6 @@ 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 +$ gras/datadesc/datadesc_usage --read ${srcdir:=.}/gras/datadesc/datadesc.little64 --log=root.fmt:%m%n > This datafile was generated on little64 (4). > ---- Test on integer ---- > ---- Test on float ---- diff --git a/teshsuite/gras_datadesc/datadesc_rw.tesh b/teshsuite/gras/datadesc/datadesc_rw.tesh similarity index 94% rename from teshsuite/gras_datadesc/datadesc_rw.tesh rename to teshsuite/gras/datadesc/datadesc_rw.tesh index 9c26b05918..317a85a6bd 100644 --- a/teshsuite/gras_datadesc/datadesc_rw.tesh +++ b/teshsuite/gras/datadesc/datadesc_rw.tesh @@ -1,6 +1,6 @@ p Check the marshaling facilities (trying to read what we write) -$ gras/datadesc_usage --log=root.fmt:%m%n +$ gras/datadesc/datadesc_usage --log=root.fmt:%m%n > ---- Test on integer ---- > ---- Test on float ---- > ---- Test on double ---- diff --git a/teshsuite/gras_datadesc/datadesc_structs.c b/teshsuite/gras/datadesc/datadesc_structs.c similarity index 100% rename from teshsuite/gras_datadesc/datadesc_structs.c rename to teshsuite/gras/datadesc/datadesc_structs.c diff --git a/teshsuite/gras_datadesc/datadesc_usage.c b/teshsuite/gras/datadesc/datadesc_usage.c similarity index 100% rename from teshsuite/gras_datadesc/datadesc_usage.c rename to teshsuite/gras/datadesc/datadesc_usage.c diff --git a/teshsuite/gras_datadesc/mk_datadesc_structs.pl b/teshsuite/gras/datadesc/mk_datadesc_structs.pl similarity index 100% rename from teshsuite/gras_datadesc/mk_datadesc_structs.pl rename to teshsuite/gras/datadesc/mk_datadesc_structs.pl -- 2.20.1