Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Cleanup: stop going into the subdir before going out [thanks Sascha]
authormquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Tue, 25 Sep 2007 15:36:48 +0000 (15:36 +0000)
committermquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Tue, 25 Sep 2007 15:36:48 +0000 (15:36 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4722 48e7efb5-ca39-0410-a469-dd3cf9ba447f

teshsuite/Makefile.am
teshsuite/Makefile.in

index af369d1..ab95175 100644 (file)
@@ -59,7 +59,7 @@ gras_datadesc_datadesc_usage_SOURCES=   gras/datadesc/datadesc_usage.c gras/data
 gras_datadesc_datadesc_usage_LDADD=     $(LDADD_RL)
 
 gras/datadesc/datadesc_structs.c: gras/datadesc/mk_datadesc_structs.pl
 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
+       perl $(top_srcdir)/teshsuite/gras/datadesc/mk_datadesc_structs.pl > $@
 
   ## Ensures the gras_msg_handle semantic ##
   ##########################################
 
   ## Ensures the gras_msg_handle semantic ##
   ##########################################
index 6d48927..7ee0487 100644 (file)
@@ -538,6 +538,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 \
@@ -551,6 +552,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"; \
              ;; \
              *) \
@@ -562,15 +564,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; \
@@ -606,6 +611,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
 
@@ -757,7 +786,7 @@ uninstall-am:
   #############################################
 
 gras/datadesc/datadesc_structs.c: gras/datadesc/mk_datadesc_structs.pl
   #############################################
 
 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
+       perl $(top_srcdir)/teshsuite/gras/datadesc/mk_datadesc_structs.pl > $@
 
   ##########################################
 
 
   ##########################################