make the makefile more manageable by splitting variables definitions for each test

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4614 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/teshsuite/Makefile.am b/teshsuite/Makefile.am
index 5c92ce8..5550ad0 100644 (file)
--- a/teshsuite/Makefile.am
+++ b/teshsuite/Makefile.am
@@ -1,50 +1,64 @@
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include
 AM_CFLAGS = -g
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include
 AM_CFLAGS = -g
 

-
-CLEANFILES = gras/datadesc/datadesc_usage.out datadesc_usage.out
-EXTRA_DIST= \
-  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
-  
+# Declare all the variables to empty, so that each test set can add
+# their content to them
+CLEANFILES = 
+EXTRA_DIST= 
+noinst_PROGRAMS=

 
 TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh
 
 TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh

-TESTS = xbt/parallel_log_crashtest.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/datadesc_r_big32_8.tesh      \
-       gras/datadesc/datadesc_r_big32_8_4.tesh  \
-       gras/datadesc/datadesc_r_big32_2.tesh
+TESTS =
+XFAIL_TESTS=

 
 

-# Data sets still to regenerate:
-XFAIL_TESTS= \
-       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/datadesc_usage   
-                              

 LDADD_SG=$(abs_top_builddir)/src/libsimgrid.la
 LDADD_RL=$(abs_top_builddir)/src/libgras.la
 
 LDADD_SG=$(abs_top_builddir)/src/libsimgrid.la
 LDADD_RL=$(abs_top_builddir)/src/libgras.la
 

-# Try parallel logs 
+#################
+### XBT tests ###
+#################
+
+  ## Try parallel logs ##
+  #######################
+  
+TESTS += xbt/parallel_log_crashtest.tesh
+noinst_PROGRAMS += xbt/parallel_log_crashtest 

 xbt_parallel_log_crashtest_LDADD = $(LDADD_RL)
 
 xbt_parallel_log_crashtest_LDADD = $(LDADD_RL)
 

-# Try structured communication facilities
+##################
+### GRAS tests ###
+##################
+
+  ## Try structured communication facilities ##
+  #############################################
+  
+CLEANFILES += gras/datadesc/datadesc_usage.out
+EXTRA_DIST += \
+  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 += \
+  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/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/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 += gras/datadesc/datadesc_usage   

 gras_datadesc_datadesc_usage_SOURCES=   gras/datadesc/datadesc_usage.c gras/datadesc/datadesc_structs.c
 gras_datadesc_datadesc_usage_LDADD=     $(LDADD_RL)
 
 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
 
 gras_datadesc_datadesc_usage_SOURCES=   gras/datadesc/datadesc_usage.c gras/datadesc/datadesc_structs.c
 gras_datadesc_datadesc_usage_LDADD=     $(LDADD_RL)
 
 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
 include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/teshsuite/Makefile.in b/teshsuite/Makefile.in
index 49c5b59..95d1f6d 100644 (file)
--- a/teshsuite/Makefile.in
+++ b/teshsuite/Makefile.in
@@ -223,39 +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
 top_srcdir = @top_srcdir@
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include
 AM_CFLAGS = -g

-CLEANFILES = gras/datadesc/datadesc_usage.out datadesc_usage.out
-EXTRA_DIST = \
-  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

 
 

+# Declare all the variables to empty, so that each test set can add
+# their content to them
+CLEANFILES = gras/datadesc/datadesc_usage.out
+EXTRA_DIST = 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_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh

-TESTS = xbt/parallel_log_crashtest.tesh     \
-       gras/datadesc/datadesc_mem.tesh          \
-       gras/datadesc/datadesc_rw.tesh           \
+TESTS = xbt/parallel_log_crashtest.tesh \
+       gras/datadesc/datadesc_mem.tesh gras/datadesc/datadesc_rw.tesh \

        gras/datadesc/datadesc_r_little32_4.tesh \
        gras/datadesc/datadesc_r_little32_4.tesh \

-       gras/datadesc/datadesc_r_little64.tesh   \
-       \
-        gras/datadesc/datadesc_r_big32_8.tesh      \
-       gras/datadesc/datadesc_r_big32_8_4.tesh  \
+       gras/datadesc/datadesc_r_little64.tesh \
+       gras/datadesc/datadesc_r_big32_8.tesh \
+       gras/datadesc/datadesc_r_big32_8_4.tesh \

        gras/datadesc/datadesc_r_big32_2.tesh
        gras/datadesc/datadesc_r_big32_2.tesh

-
-

 # Data sets still to regenerate:
 # Data sets still to regenerate:

-XFAIL_TESTS = \
-       gras/datadesc/datadesc_r_little32.tesh   \
-        gras/datadesc/datadesc_r_big32_8.tesh      \
-       gras/datadesc/datadesc_r_big32_8_4.tesh  \
+XFAIL_TESTS = 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
        gras/datadesc/datadesc_r_big32_2.tesh

-

 LDADD_SG = $(abs_top_builddir)/src/libsimgrid.la
 LDADD_RL = $(abs_top_builddir)/src/libgras.la
 LDADD_SG = $(abs_top_builddir)/src/libsimgrid.la
 LDADD_RL = $(abs_top_builddir)/src/libgras.la

-
-# Try parallel logs 

 xbt_parallel_log_crashtest_LDADD = $(LDADD_RL)
 xbt_parallel_log_crashtest_LDADD = $(LDADD_RL)

-
-# Try structured communication facilities

 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
 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


@@ -440,6 +432,7 @@ distclean-tags:
 
 check-TESTS: $(TESTS)
        @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[        ]'; \
 
 check-TESTS: $(TESTS)
        @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[        ]'; \

+       faillist=""; xpasslist=""; xfaillist=""; skiplist=""; \

        srcdir=$(srcdir); export srcdir; \
        list=' $(TESTS) '; \
        if test -n "$$list"; then \
        srcdir=$(srcdir); export srcdir; \
        list=' $(TESTS) '; \
        if test -n "$$list"; then \


@@ -453,6 +446,7 @@ check-TESTS: $(TESTS)
              *$$ws$$tst$$ws*) \
                xpass=`expr $$xpass + 1`; \
                failed=`expr $$failed + 1`; \
              *$$ws$$tst$$ws*) \
                xpass=`expr $$xpass + 1`; \
                failed=`expr $$failed + 1`; \

+               xpasslist="$$xpasslist $$tst"; \

                echo "XPASS: $$tst"; \
              ;; \
              *) \
                echo "XPASS: $$tst"; \
              ;; \
              *) \


@@ -464,15 +458,18 @@ check-TESTS: $(TESTS)
              case " $(XFAIL_TESTS) " in \
              *$$ws$$tst$$ws*) \
                xfail=`expr $$xfail + 1`; \
              case " $(XFAIL_TESTS) " in \
              *$$ws$$tst$$ws*) \
                xfail=`expr $$xfail + 1`; \

+               xfaillist="$$xfaillist $$tst"; \

                echo "XFAIL: $$tst"; \
              ;; \
              *) \
                failed=`expr $$failed + 1`; \
                echo "XFAIL: $$tst"; \
              ;; \
              *) \
                failed=`expr $$failed + 1`; \

+               faillist="$$faillist $$tst"; \

                echo "FAIL: $$tst"; \
              ;; \
              esac; \
            else \
              skip=`expr $$skip + 1`; \
                echo "FAIL: $$tst"; \
              ;; \
              esac; \
            else \
              skip=`expr $$skip + 1`; \

+             skiplist="$$skiplist $$tst"; \

              echo "SKIP: $$tst"; \
            fi; \
          done; \
              echo "SKIP: $$tst"; \
            fi; \
          done; \


@@ -508,6 +505,30 @@ check-TESTS: $(TESTS)
          test -z "$$skipped" || echo "$$skipped"; \
          test -z "$$report" || echo "$$report"; \
          echo "$$dashes"; \
          test -z "$$skipped" || echo "$$skipped"; \
          test -z "$$report" || echo "$$report"; \
          echo "$$dashes"; \

+         if test -n "$$faillist" ; then \
+           echo "Failed tests:";\
+           for tst in $$faillist ; do \
+             echo "  "$$tst;\
+           done;\
+         fi;\
+         if test -n "$$xpasslist" ; then \
+           echo "Unexpectedly passed tests:";\
+           for tst in $$xpasslist ; do \
+             echo "  "$$tst;\
+           done;\
+         fi;\
+         if test -n "$$xfaillist" ; then \
+           echo "Expected failures:";\
+           for tst in $$xfaillist ; do \
+             echo "  "$$tst;\
+           done;\
+         fi;\
+         if test -n "$$skiplist" ; then \
+           echo "Skipped tests:";\
+           for tst in $$skiplist ; do \
+             echo "  "$$tst;\
+           done;\
+         fi;\

          test "$$failed" -eq 0; \
        else :; fi
 
          test "$$failed" -eq 0; \
        else :; fi
 


@@ -645,6 +666,18 @@ uninstall-am:
        tags uninstall uninstall-am
 
 
        tags uninstall uninstall-am
 
 

+#################
+### XBT tests ###
+#################
+
+  #######################
+
+##################
+### GRAS tests ###
+##################
+
+  #############################################
+

 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
 
 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