Properly say the test suite that java tests are not run when it's the case

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

diff --git a/examples/Makefile.am b/examples/Makefile.am
index fabb92a..14df417 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -6,9 +6,6 @@
 
 EXTRA_DIST= platforms/prop.xml
 
-SUBDIRS= msg gras amok simdag 
-if HAVE_JAVA
-  SUBDIRS+= java
-endif
+SUBDIRS= msg gras amok simdag java
 
 include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/examples/Makefile.in b/examples/Makefile.in
index 6ebdaf5..3eea3e4 100644 (file)
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -43,7 +43,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-@HAVE_JAVA_TRUE@am__append_1 = java
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/acmacro/dist-files.mk
 subdir = examples
@@ -74,7 +73,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive       \
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = msg gras amok simdag java
+DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADDR2LINE = @ADDR2LINE@
@@ -212,7 +211,7 @@ target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 EXTRA_DIST = platforms/prop.xml
-SUBDIRS = msg gras amok simdag $(am__append_1)
+SUBDIRS = msg gras amok simdag java
 all: all-recursive
 
 .SUFFIXES:

diff --git a/examples/java/basic/Makefile.am b/examples/java/basic/Makefile.am
index 7c6dfbc..e4cd679 100644 (file)
--- a/examples/java/basic/Makefile.am
+++ b/examples/java/basic/Makefile.am
@@ -11,13 +11,13 @@ EXTRA_DIST=basic_deployment.xml basic_platform.xml
 JAVA_SRC=Master.java Forwarder.java Slave.java BasicTest.java \
          BasicTask.java FinalizeTask.java
 JAVA_TESTS=BasicTest.class
+TESTS=$(JAVA_TESTS)
 
 EXTRA_DIST+=$(JAVA_SRC)
 
 # Declare test class
 if HAVE_JAVA
   noinst_JAVA=$(JAVA_SRC)
-  TESTS=$(JAVA_TESTS)
 endif
 
 include $(srcdir)/../java_test.mk

diff --git a/examples/java/basic/Makefile.in b/examples/java/basic/Makefile.in
index 87f7b4b..c071144 100644 (file)
--- a/examples/java/basic/Makefile.in
+++ b/examples/java/basic/Makefile.in
@@ -210,12 +210,13 @@ JAVA_SRC = Master.java Forwarder.java Slave.java BasicTest.java \
          BasicTask.java FinalizeTask.java
 
 JAVA_TESTS = BasicTest.class
+TESTS = $(JAVA_TESTS)
 
 # Declare test class
 @HAVE_JAVA_TRUE@noinst_JAVA = $(JAVA_SRC)
-@HAVE_JAVA_TRUE@TESTS = $(JAVA_TESTS)
 JAVAROOT = .
 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
@@ -224,9 +225,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
 

diff --git a/examples/java/comm_time/Makefile.am b/examples/java/comm_time/Makefile.am
index f6b3a60..c469a01 100644 (file)
--- a/examples/java/comm_time/Makefile.am
+++ b/examples/java/comm_time/Makefile.am
@@ -11,13 +11,13 @@ EXTRA_DIST=comm_time_deployment.xml comm_time_platform.xml
 JAVA_SRC=Master.java Slave.java CommTimeTest.java \
          CommTimeTask.java FinalizeTask.java
 JAVA_TESTS=CommTimeTest.class
+TESTS=$(JAVA_TESTS)
 
 EXTRA_DIST+=$(JAVA_SRC)
 
 # Declare test class
 if HAVE_JAVA
   noinst_JAVA=$(JAVA_SRC)
-  TESTS=$(JAVA_TESTS)
 endif
 
 include $(srcdir)/../java_test.mk

diff --git a/examples/java/comm_time/Makefile.in b/examples/java/comm_time/Makefile.in
index 509948b..78bf1a4 100644 (file)
--- a/examples/java/comm_time/Makefile.in
+++ b/examples/java/comm_time/Makefile.in
@@ -211,12 +211,13 @@ 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)
-@HAVE_JAVA_TRUE@TESTS = $(JAVA_TESTS)
 JAVAROOT = .
 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
@@ -225,9 +226,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
 

diff --git a/examples/java/java_test.mk b/examples/java/java_test.mk
index 0f6e1f6..cf49303 100644 (file)
--- a/examples/java/java_test.mk
+++ b/examples/java/java_test.mk
@@ -14,9 +14,13 @@ 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 
+if HAVE_JAVA
+  TESTS_ENVIRONMENT=LD_LIBRARY_PATH="$(top_srcdir)/src/.libs:$$LD_LIBRARY_PATH" \
+                    CLASSPATH=".:$(top_srcdir)/src/simgrid.jar:$$CLASSPATH" \
+                    $(srcdir)/../runtest 
+else
+  TESTS_ENVIRONMENT=DO_NOT_HAVE_JAVA=1 $(srcdir)/../runtest 
+endif
 
 # declare that we must recompile everything before lauching tests
 $(TESTS): classnoinst.stamp

diff --git a/examples/java/ping_pong/Makefile.am b/examples/java/ping_pong/Makefile.am
index 7c9fd0a..39e1cb7 100644 (file)
--- a/examples/java/ping_pong/Makefile.am
+++ b/examples/java/ping_pong/Makefile.am
@@ -10,13 +10,13 @@ EXTRA_DIST=ping_pong_deployment.xml ping_pong_platform.xml
 # Declare sources:
 JAVA_SRC=Sender.java Receiver.java PingPongTask.java PingPongTest.java
 JAVA_TESTS=PingPongTest.class
+TESTS=$(JAVA_TESTS)
 
 EXTRA_DIST+=$(JAVA_SRC)
 
 # Declare test class
 if HAVE_JAVA
   noinst_JAVA=$(JAVA_SRC)
-  TESTS=$(JAVA_TESTS)
 endif
 
 include $(srcdir)/../java_test.mk

diff --git a/examples/java/ping_pong/Makefile.in b/examples/java/ping_pong/Makefile.in
index e409952..f108d6c 100644 (file)
--- a/examples/java/ping_pong/Makefile.in
+++ b/examples/java/ping_pong/Makefile.in
@@ -209,12 +209,13 @@ EXTRA_DIST = ping_pong_deployment.xml ping_pong_platform.xml \
 # Declare sources:
 JAVA_SRC = Sender.java Receiver.java PingPongTask.java PingPongTest.java
 JAVA_TESTS = PingPongTest.class
+TESTS = $(JAVA_TESTS)
 
 # Declare test class
 @HAVE_JAVA_TRUE@noinst_JAVA = $(JAVA_SRC)
-@HAVE_JAVA_TRUE@TESTS = $(JAVA_TESTS)
 JAVAROOT = .
 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
@@ -223,9 +224,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
 

diff --git a/examples/java/runtest b/examples/java/runtest
index 573c5e3..d0ae1d1 100755 (executable)
--- a/examples/java/runtest
+++ b/examples/java/runtest
@@ -1,5 +1,9 @@
 #! /bin/sh
 
+if [ "x$DO_NOT_HAVE_JAVA" = x1 ] ; then
+  return 77
+fi
+
 t=`basename $1 .class`
 
 # uncomment this when JNI becomes mad

diff --git a/examples/java/suspend/Makefile.am b/examples/java/suspend/Makefile.am
index bd3531e..183f15a 100644 (file)
--- a/examples/java/suspend/Makefile.am
+++ b/examples/java/suspend/Makefile.am
@@ -10,13 +10,13 @@ EXTRA_DIST=suspend_deployment.xml suspend_platform.xml
 # Declare sources:
 JAVA_SRC=DreamMaster.java LazyGuy.java SuspendTest.java
 JAVA_TESTS=SuspendTest.class
+TESTS=$(JAVA_TESTS)
 
 EXTRA_DIST+=$(JAVA_SRC)
 
 # Declare test class
 if HAVE_JAVA
   noinst_JAVA=$(JAVA_SRC)
-  TESTS=$(JAVA_TESTS)
 endif
 
 include $(srcdir)/../java_test.mk

diff --git a/examples/java/suspend/Makefile.in b/examples/java/suspend/Makefile.in
index 1d163ae..ddeff5b 100644 (file)
--- a/examples/java/suspend/Makefile.in
+++ b/examples/java/suspend/Makefile.in
@@ -208,12 +208,13 @@ EXTRA_DIST = suspend_deployment.xml suspend_platform.xml $(JAVA_SRC)
 # Declare sources:
 JAVA_SRC = DreamMaster.java LazyGuy.java SuspendTest.java
 JAVA_TESTS = SuspendTest.class
+TESTS = $(JAVA_TESTS)
 
 # Declare test class
 @HAVE_JAVA_TRUE@noinst_JAVA = $(JAVA_SRC)
-@HAVE_JAVA_TRUE@TESTS = $(JAVA_TESTS)
 JAVAROOT = .
 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
@@ -222,9 +223,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