X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d535428dd046734638334061f8b2ceb1a037854d..741d951a0891942a7c26ad070f0292ee65a82c49:/examples/java/comm_time/Makefile.in

diff --git a/examples/java/comm_time/Makefile.in b/examples/java/comm_time/Makefile.in
index c38d1f5856..8a19538f16 100644
--- a/examples/java/comm_time/Makefile.in
+++ b/examples/java/comm_time/Makefile.in
@@ -14,6 +14,12 @@
 
 @SET_MAKE@
 
+# Copyright (c) 2004-2007. The SimGrid team. All right reserved.
+
+# This file is part of the SimGrid project. This is free software:
+# You can redistribute and/or modify it under the terms of the
+# GNU LGPL (v2.1) licence.
+
 #########################
 # How to compile the code
 # All this to only get a dumb javac *java... Automake still have issues with java
@@ -132,6 +138,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PTH_STACK_GROWTH = @PTH_STACK_GROWTH@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIMGRID_DEP = @SIMGRID_DEP@
@@ -197,13 +204,21 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = comm_time_deployment.xml comm_time_platform.xml surfxml.dtd
+EXTRA_DIST = comm_time_deployment.xml comm_time_platform.xml \
+	$(JAVA_SRC)
 
 # Declare sources:
-noinst_JAVA = Master.java Slave.java CommTimeTest.java CommTimeTask.java
-TESTS = CommTimeTest.class
+JAVA_SRC = Master.java Slave.java CommTimeTest.java \
+         CommTimeTask.java FinalizeTask.java
+
+JAVA_TESTS = CommTimeTest.class
+TESTS = $(JAVA_TESTS)
+
+# Declare test class
+@HAVE_JAVA_TRUE@noinst_JAVA = $(JAVA_SRC)
 JAVAROOT = .
-AM_JAVACFLAGS = -classpath $(top_srcdir)/src/simgrid.jar
+AM_JAVACFLAGS = -classpath $(top_srcdir)/src/simgrid.jar:.
+@HAVE_JAVA_FALSE@TESTS_ENVIRONMENT = DO_NOT_HAVE_JAVA=1 $(srcdir)/../runtest 
 
 ##########################
 # What to do on make check
@@ -212,9 +227,9 @@ AM_JAVACFLAGS = -classpath $(top_srcdir)/src/simgrid.jar
 # We need to override the CLASSPATH to add simgrid.jar and current dir to the picture
 # We also need to express dependencies manually (in each test dir)
 # Damn...
-TESTS_ENVIRONMENT = LD_LIBRARY_PATH="$(top_srcdir)/src/.libs:$$LD_LIBRARY_PATH" \
-                  CLASSPATH=".:$(top_srcdir)/src/simgrid.jar:$$CLASSPATH" \
-                  $(srcdir)/../runtest 
+@HAVE_JAVA_TRUE@TESTS_ENVIRONMENT = LD_LIBRARY_PATH="$(top_srcdir)/src/.libs:$$LD_LIBRARY_PATH" \
+@HAVE_JAVA_TRUE@                    CLASSPATH=".:$(top_srcdir)/src/simgrid.jar:$$CLASSPATH" \
+@HAVE_JAVA_TRUE@                    $(srcdir)/../runtest 
 
 all: all-am
 
@@ -277,7 +292,6 @@ 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 \
@@ -291,7 +305,6 @@ check-TESTS: $(TESTS)
 	      *$$ws$$tst$$ws*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
-		xpasslist="$$xpasslist $$tst"; \
 		echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
@@ -303,18 +316,15 @@ 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; \
@@ -350,30 +360,6 @@ 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
 
@@ -501,9 +487,6 @@ uninstall-am:
 	uninstall uninstall-am
 
 
-#if HAVE_JAVA
- # Declare test class
-
 # declare that we must recompile everything before lauching tests
 $(TESTS): classnoinst.stamp
 
@@ -511,7 +494,6 @@ 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
 
 # Cruft
 # Tell versions [3.59,3.63) of GNU make to not export all variables.