surf/cpu_private.h surf/workstation_private.h \
surf/surf_timer_private.h surf/surfxml_parse.c surf/surfxml.l \
surf/surfxml.c surf/surfxml.dtd surf/network_private.h \
- network_gtnets_private.h surf/workstation_KCCFLN05_private.h \
- include/surf/maxmin.h include/surf/trace_mgr.h \
- include/surf/surf.h include/surf/surfxml_parse_private.h \
- include/xbt/xbt_os_time.h include/xbt/xbt_os_thread.h \
- include/xbt/context.h msg/private.h simdag/private.h \
- gras/DataDesc/ddt_parse.yy.l gras/Virtu/virtu_interface.h \
+ network_gtnets_private.h include/surf/maxmin.h \
+ include/surf/trace_mgr.h include/surf/surf.h \
+ include/surf/surfxml_parse_private.h include/xbt/xbt_os_time.h \
+ include/xbt/xbt_os_thread.h include/xbt/context.h \
+ msg/private.h simdag/private.h gras/DataDesc/ddt_parse.yy.l \
+ gras/Virtu/virtu_interface.h \
amok/Bandwidth/bandwidth_private.h amok/amok_modinter.h \
$(am__append_3) $(am__append_4) $(am__append_9) \
$(am__append_10)
java/simgrid/msg/ProcessNotFoundException.java \
\
java/simgrid/msg/Process.java \
+ java/simgrid/msg/DTDResolver.java \
java/simgrid/msg/ApplicationHandler.java \
java/simgrid/msg/Channel.java \
java/simgrid/msg/Host.java \
java/simgrid/msg/Msg.java \
java/simgrid/msg/Task.java \
- java/simgrid/msg/ParallelTask.java
+ java/simgrid/msg/ParallelTask.java \
+ \
+ java/simgrid/msg/Sem.java
SIMDAG_SRC = simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c simdag/sd_workstation.c
GRAS_COMMON_SRC = \
@GRAMINE_MODE_FALSE@ @builddir@/xbt_str_unit.c \
@GRAMINE_MODE_FALSE@ @builddir@/config_unit.c
-@GRAMINE_MODE_FALSE@CLEANFILES = $(TEST_UNITS)
@GRAMINE_MODE_FALSE@BUILT_SOURCES = ../include/surf/surfxml.h surf/surfxml.c \
@GRAMINE_MODE_FALSE@ ../include/xbt/graphxml.h xbt/graphxml.c \
@GRAMINE_MODE_FALSE@ gras/DataDesc/ddt_parse.yy.c \
@GRAMINE_MODE_FALSE@testall_SOURCES = $(TEST_UNITS) @builddir@/simgrid_units_main.c
@GRAMINE_MODE_FALSE@testall_LDADD = libgras.la
@GRAMINE_MODE_FALSE@TESTS_ENVIRONMENT = $(SG_TEST_EXENV)
+@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@CLEANFILES = $(TEST_UNITS)
all: $(BUILT_SOURCES) gras_config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
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 \
*$$ws$$tst$$ws*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
+ xpasslist="$$xpasslist $$tst"; \
echo "XPASS: $$tst"; \
;; \
*) \
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; \
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
@HAVE_JAVA_TRUE@clean-local:
@HAVE_JAVA_TRUE@ -rm -rf .classes
-@HAVE_JAVA_TRUE@simgrid.jar: $(JMSG_JAVA_SRC)
+@HAVE_JAVA_TRUE@simgrid.jar: $(JMSG_JAVA_SRC) ./surf/surfxml.dtd
@HAVE_JAVA_TRUE@ [ -e .classes ] || mkdir .classes
-@HAVE_JAVA_TRUE@ $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC)
-@HAVE_JAVA_TRUE@ $(JAR) cvf simgrid.jar -C .classes .;
+@HAVE_JAVA_TRUE@ $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC)
+@HAVE_JAVA_TRUE@ $(JAR) cvf simgrid.jar -C .classes . ./surf/surfxml.dtd;
@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/cunit_unit.c: xbt/cunit.c
@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ @top_srcdir@/tools/sg_unit_extractor.pl $^
@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ rm -vf $$dep @srcdir@/$$dep; touch $$dep; \
@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ done
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@$(TEST_UNITS) simgrid_units_main.c clean-units:
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: Test units not generated."
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: If you are using a CVS checkout, configure with the --enable-maintainer-mode flag"
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: If not, please report the bug to the simgrid-devel mailing list."
-@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @exit 1
+@BOTBUILD_MODE_TRUE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@$(TEST_UNITS) simgrid_units_main.c clean-units:
+@BOTBUILD_MODE_TRUE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "WARNING: Test units not generated, but touched instead since this is a bot build."
+@BOTBUILD_MODE_TRUE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ touch $@
+@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@$(TEST_UNITS) simgrid_units_main.c clean-units:
+@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: Test units not generated."
+@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: If you are using a SVN checkout, configure with the --enable-maintainer-mode flag"
+@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: If not, please report the bug to the simgrid-devel mailing list."
+@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @exit 1
###
### Regenerate what needs to with flex & flexml
