Properly disable broken test, plus small fixups

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

diff --git a/examples/java/Makefile.am b/examples/java/Makefile.am
index 171e928..deb3ebe 100644 (file)
--- a/examples/java/Makefile.am
+++ b/examples/java/Makefile.am
@@ -1,5 +1,4 @@
-SUBDIRS= basic ping_pong comm_time
-# suspend
+SUBDIRS= basic ping_pong comm_time suspend
 
 EXTRA_DIST=java_test.mk
 include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/examples/java/Makefile.in b/examples/java/Makefile.in
index 7470516..0908302 100644 (file)
--- a/examples/java/Makefile.in
+++ b/examples/java/Makefile.in
@@ -205,8 +205,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = basic ping_pong comm_time
-# suspend
+SUBDIRS = basic ping_pong comm_time suspend
 EXTRA_DIST = java_test.mk
 all: all-recursive
 

diff --git a/examples/java/basic/Makefile.am b/examples/java/basic/Makefile.am
index 024a2a3..9591dca 100644 (file)
--- a/examples/java/basic/Makefile.am
+++ b/examples/java/basic/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST=msg_test_deployment.xml msg_test_platform.xml surfxml.dtd
+EXTRA_DIST=basic_deployment.xml basic_platform.xml surfxml.dtd
 
 # Declare sources:
 noinst_JAVA= Master.java Forwarder.java Slave.java BasicTest.java BasicTask.java

diff --git a/examples/java/basic/Makefile.in b/examples/java/basic/Makefile.in
index 863396f..70a5237 100644 (file)
--- a/examples/java/basic/Makefile.in
+++ b/examples/java/basic/Makefile.in
@@ -198,7 +198,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = msg_test_deployment.xml msg_test_platform.xml surfxml.dtd
+EXTRA_DIST = basic_deployment.xml basic_platform.xml surfxml.dtd
 
 # Declare sources:
 noinst_JAVA = Master.java Forwarder.java Slave.java BasicTest.java BasicTask.java

diff --git a/examples/java/suspend/Makefile.am b/examples/java/suspend/Makefile.am
index c0c8a2c..dbe489c 100644 (file)
--- a/examples/java/suspend/Makefile.am
+++ b/examples/java/suspend/Makefile.am
@@ -1,12 +1,10 @@
-EXTRA_DIST=msg_test_suspend_deployment.xml msg_test_suspend_platform.xml surfxml.dtd
+EXTRA_DIST=suspend_deployment.xml suspend_platform.xml surfxml.dtd
 
 # Declare sources:
 noinst_JAVA= DreamMaster.java LazyGuy.java SuspendTest.java
 
-# Declare test class
-#if HAVE_JAVA
-TESTS=SuspendTest.class
-#endif
+# Declare test class 
+# TESTS=SuspendTest.class (broken test)
 
 include $(srcdir)/../java_test.mk
 

diff --git a/examples/java/suspend/Makefile.in b/examples/java/suspend/Makefile.in
index 177e168..2109429 100644 (file)
--- a/examples/java/suspend/Makefile.in
+++ b/examples/java/suspend/Makefile.in
@@ -198,14 +198,10 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = msg_test_suspend_deployment.xml msg_test_suspend_platform.xml surfxml.dtd
+EXTRA_DIST = suspend_deployment.xml suspend_platform.xml surfxml.dtd
 
 # Declare sources:
 noinst_JAVA = DreamMaster.java LazyGuy.java SuspendTest.java
-
-# Declare test class
-#if HAVE_JAVA
-TESTS = SuspendTest.class
 JAVAROOT = .
 AM_JAVACFLAGS = -cp $(top_srcdir)/src/simgrid.jar
 
@@ -279,79 +275,6 @@ ctags: CTAGS
 CTAGS:
 
 
-check-TESTS: $(TESTS)
-       @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[        ]'; \
-       srcdir=$(srcdir); export srcdir; \
-       list=' $(TESTS) '; \
-       if test -n "$$list"; then \
-         for tst in $$list; do \
-           if test -f ./$$tst; then dir=./; \
-           elif test -f $$tst; then dir=; \
-           else dir="$(srcdir)/"; fi; \
-           if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-             all=`expr $$all + 1`; \
-             case " $(XFAIL_TESTS) " in \
-             *$$ws$$tst$$ws*) \
-               xpass=`expr $$xpass + 1`; \
-               failed=`expr $$failed + 1`; \
-               echo "XPASS: $$tst"; \
-             ;; \
-             *) \
-               echo "PASS: $$tst"; \
-             ;; \
-             esac; \
-           elif test $$? -ne 77; then \
-             all=`expr $$all + 1`; \
-             case " $(XFAIL_TESTS) " in \
-             *$$ws$$tst$$ws*) \
-               xfail=`expr $$xfail + 1`; \
-               echo "XFAIL: $$tst"; \
-             ;; \
-             *) \
-               failed=`expr $$failed + 1`; \
-               echo "FAIL: $$tst"; \
-             ;; \
-             esac; \
-           else \
-             skip=`expr $$skip + 1`; \
-             echo "SKIP: $$tst"; \
-           fi; \
-         done; \
-         if test "$$failed" -eq 0; then \
-           if test "$$xfail" -eq 0; then \
-             banner="All $$all tests passed"; \
-           else \
-             banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-           fi; \
-         else \
-           if test "$$xpass" -eq 0; then \
-             banner="$$failed of $$all tests failed"; \
-           else \
-             banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
-           fi; \
-         fi; \
-         dashes="$$banner"; \
-         skipped=""; \
-         if test "$$skip" -ne 0; then \
-           skipped="($$skip tests were not run)"; \
-           test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-             dashes="$$skipped"; \
-         fi; \
-         report=""; \
-         if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-           report="Please report to $(PACKAGE_BUGREPORT)"; \
-           test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-             dashes="$$report"; \
-         fi; \
-         dashes=`echo "$$dashes" | sed s/./=/g`; \
-         echo "$$dashes"; \
-         echo "$$banner"; \
-         test -z "$$skipped" || echo "$$skipped"; \
-         test -z "$$report" || echo "$$report"; \
-         echo "$$dashes"; \
-         test "$$failed" -eq 0; \
-       else :; fi
-
 distdir: $(DISTFILES)
        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -379,7 +302,6 @@ distdir: $(DISTFILES)
          fi; \
        done
 check-am: all-am
-       $(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
 all-am: Makefile classnoinst.stamp
 installdirs:
@@ -463,10 +385,10 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-TESTS check-am clean clean-generic \
-       clean-libtool clean-noinstJAVA distclean distclean-generic \
-       distclean-libtool distdir dvi dvi-am html html-am info info-am \
-       install install-am install-data install-data-am install-dvi \
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       clean-noinstJAVA distclean distclean-generic distclean-libtool \
+       distdir dvi dvi-am html html-am info info-am install \
+       install-am install-data install-data-am install-dvi \
        install-dvi-am install-exec install-exec-am install-html \
        install-html-am install-info install-info-am install-man \
        install-pdf install-pdf-am install-ps install-ps-am \
@@ -483,7 +405,9 @@ dist-files:
        @for n in $(DISTFILES) ; do echo $(SRCFILE)$$n; done
        @echo
        @for n in $(DIST_SUBDIRS) ; do if [ x$$n != x. ] ; then $(MAKE) -C $$n dist-files SRCFILE=$(SRCFILE)$$n/ ; fi; done
-#endif
+
+# Declare test class 
+# TESTS=SuspendTest.class (broken test)
 
 # Cruft
 # Tell versions [3.59,3.63) of GNU make to not export all variables.