Automatically generated files

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

diff --git a/examples/java/basic/Makefile.in b/examples/java/basic/Makefile.in
index 810feaa..1a9a234 100644 (file)
--- a/examples/java/basic/Makefile.in
+++ b/examples/java/basic/Makefile.in
@@ -197,8 +197,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@

-CLASSPATH = ../../../src/simgrid.jar
-EXTRA_DIST = basic_deployment.xml basic_platform.xml surfxml.dtd
+EXTRA_DIST = basic_deployment.xml basic_platform.xml

 
 # Declare sources:
 noinst_JAVA = Master.java Forwarder.java Slave.java BasicTest.java BasicTask.java
 
 # Declare sources:
 noinst_JAVA = Master.java Forwarder.java Slave.java BasicTest.java BasicTask.java


@@ -206,7 +205,7 @@ noinst_JAVA = Master.java Forwarder.java Slave.java BasicTest.java BasicTask.jav
 # Declare test class
 TESTS = BasicTest.class
 JAVAROOT = .
 # Declare test class
 TESTS = BasicTest.class
 JAVAROOT = .

-AM_JAVACFLAGS = -classpath $(top_srcdir)/src/simgrid.jar
+AM_JAVACFLAGS = -classpath $(top_srcdir)/src/simgrid.jar:.

 
 ##########################
 # What to do on make check
 
 ##########################
 # What to do on make check


@@ -280,7 +279,6 @@ CTAGS:
 
 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 \


@@ -294,7 +292,6 @@ 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"; \
              ;; \
              *) \


@@ -306,18 +303,15 @@ 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; \


@@ -353,30 +347,6 @@ 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