New version of the java bindings by Malek, passing all [existing] tests

[simgrid.git] / examples / java / comm_time / Makefile.in

diff --git a/examples/java/comm_time/Makefile.in b/examples/java/comm_time/Makefile.in
index 034b6cc..c38d1f5 100644 (file)
--- a/examples/java/comm_time/Makefile.in
+++ b/examples/java/comm_time/Makefile.in
@@ -135,6 +135,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIMGRID_DEP = @SIMGRID_DEP@
+SMPI_DEP = @SMPI_DEP@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING = @WARNING@
@@ -202,7 +203,7 @@ EXTRA_DIST = comm_time_deployment.xml comm_time_platform.xml surfxml.dtd
 noinst_JAVA = Master.java Slave.java CommTimeTest.java CommTimeTask.java
 TESTS = CommTimeTest.class
 JAVAROOT = .
-AM_JAVACFLAGS = -cp $(top_srcdir)/src/simgrid.jar
+AM_JAVACFLAGS = -classpath $(top_srcdir)/src/simgrid.jar
 
 ##########################
 # What to do on make check
@@ -276,6 +277,7 @@ CTAGS:
 
 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 \
@@ -289,6 +291,7 @@ check-TESTS: $(TESTS)
              *$$ws$$tst$$ws*) \
                xpass=`expr $$xpass + 1`; \
                failed=`expr $$failed + 1`; \
+               xpasslist="$$xpasslist $$tst"; \
                echo "XPASS: $$tst"; \
              ;; \
              *) \
@@ -300,15 +303,18 @@ check-TESTS: $(TESTS)
              case " $(XFAIL_TESTS) " in \
              *$$ws$$tst$$ws*) \
                xfail=`expr $$xfail + 1`; \
+               xfaillist="$$xfaillist $$tst"; \
                echo "XFAIL: $$tst"; \
              ;; \
              *) \
                failed=`expr $$failed + 1`; \
+               faillist="$$faillist $$tst"; \
                echo "FAIL: $$tst"; \
              ;; \
              esac; \
            else \
              skip=`expr $$skip + 1`; \
+             skiplist="$$skiplist $$tst"; \
              echo "SKIP: $$tst"; \
            fi; \
          done; \
@@ -344,6 +350,30 @@ check-TESTS: $(TESTS)
          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