From 44e9ce02788f6c438b9c5383b34c09b8a440b74b Mon Sep 17 00:00:00 2001 From: alegrand Date: Wed, 8 Aug 2007 10:21:52 +0000 Subject: [PATCH] Committing automatically generated file (after the "sed" dependancy addition). git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4052 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- Makefile.in | 11 --- doc/Makefile.in | 1 - examples/Makefile.in | 1 - examples/amok/Makefile.in | 1 - examples/amok/bandwidth/Makefile.in | 1 - examples/amok/saturate/Makefile.in | 1 - examples/gras/Makefile.in | 1 - examples/gras/all2all/Makefile.in | 1 - examples/gras/chrono/Makefile.in | 1 - examples/gras/mmrpc/Makefile.in | 1 - .../mutual_exclusion/simple_token/Makefile.in | 1 - examples/gras/ping/Makefile.in | 1 - examples/gras/pmm/Makefile.in | 1 - examples/gras/rpc/Makefile.in | 1 - examples/gras/spawn/Makefile.in | 1 - examples/gras/synchro/Makefile.in | 1 - examples/gras/timer/Makefile.in | 1 - examples/java/Makefile.in | 1 - examples/java/basic/Makefile.in | 4 +- examples/java/comm_time/Makefile.in | 3 +- examples/java/ping_pong/Makefile.in | 3 +- examples/java/suspend/Makefile.in | 92 +++++++++++++++++-- examples/msg/Makefile.in | 21 +++-- examples/simdag/Makefile.in | 1 - include/Makefile.in | 1 - src/Makefile.in | 18 +--- testsuite/Makefile.in | 1 - tools/Makefile.in | 1 - tools/gras/Makefile.in | 1 - tools/tesh/Makefile.in | 1 - 30 files changed, 103 insertions(+), 72 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3ca43c4e20..40c81fc145 100644 --- a/Makefile.in +++ b/Makefile.in @@ -157,7 +157,6 @@ 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@ @@ -706,16 +705,6 @@ gramine: @MAINTAINER_MODE_TRUE@ $(MAKE) -C ~/CVSIMPORT/pkg-grid/gras deb check @MAINTAINER_MODE_TRUE@ dput local *.changes -@MAINTAINER_MODE_TRUE@publish-old: dist -@MAINTAINER_MODE_TRUE@ @echo "----[ Put the documentation on the local filesystem ]----" -@MAINTAINER_MODE_TRUE@ rm -rf ~/public_html/gras/doc -@MAINTAINER_MODE_TRUE@ mkdir ~/public_html/gras/doc -@MAINTAINER_MODE_TRUE@ cp -r doc/html ~/public_html/gras/doc -@MAINTAINER_MODE_TRUE@ @echo "----[ Put the tarball @VERSION@ on the local filesystem ]----" -@MAINTAINER_MODE_TRUE@ cp @PACKAGE@-@VERSION@.tar.gz ~/public_html/gras/dl -@MAINTAINER_MODE_TRUE@ @echo "----[ Sync remote host ]----" -@MAINTAINER_MODE_TRUE@ $(MAKE) -C public_html publish - @MAINTAINER_MODE_TRUE@publish: dist @MAINTAINER_MODE_TRUE@ @echo "----[ Put the tarball @VERSION@ on gforge ]----" # scp @PACKAGE@-@VERSION@.tar.gz gcl.ucsd.edu:/home/www/simgrid/dl/ diff --git a/doc/Makefile.in b/doc/Makefile.in index e62f3dc540..962223a788 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -127,7 +127,6 @@ 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@ diff --git a/examples/Makefile.in b/examples/Makefile.in index dcc0b54b70..941aefc17f 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -140,7 +140,6 @@ 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@ diff --git a/examples/amok/Makefile.in b/examples/amok/Makefile.in index f18bb6ce9b..0ec85c236d 100644 --- a/examples/amok/Makefile.in +++ b/examples/amok/Makefile.in @@ -139,7 +139,6 @@ 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@ diff --git a/examples/amok/bandwidth/Makefile.in b/examples/amok/bandwidth/Makefile.in index da9d1b0077..698875b8c5 100644 --- a/examples/amok/bandwidth/Makefile.in +++ b/examples/amok/bandwidth/Makefile.in @@ -161,7 +161,6 @@ 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@ diff --git a/examples/amok/saturate/Makefile.in b/examples/amok/saturate/Makefile.in index 63050051a4..c266f8f665 100644 --- a/examples/amok/saturate/Makefile.in +++ b/examples/amok/saturate/Makefile.in @@ -161,7 +161,6 @@ 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@ diff --git a/examples/gras/Makefile.in b/examples/gras/Makefile.in index 586fdf60a6..318484b74e 100644 --- a/examples/gras/Makefile.in +++ b/examples/gras/Makefile.in @@ -139,7 +139,6 @@ 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@ diff --git a/examples/gras/all2all/Makefile.in b/examples/gras/all2all/Makefile.in index f5139db05b..e74c3027a7 100644 --- a/examples/gras/all2all/Makefile.in +++ b/examples/gras/all2all/Makefile.in @@ -174,7 +174,6 @@ 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@ diff --git a/examples/gras/chrono/Makefile.in b/examples/gras/chrono/Makefile.in index 2ee1445edf..47e6f41a68 100644 --- a/examples/gras/chrono/Makefile.in +++ b/examples/gras/chrono/Makefile.in @@ -168,7 +168,6 @@ 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@ diff --git a/examples/gras/mmrpc/Makefile.in b/examples/gras/mmrpc/Makefile.in index c1ffdb0477..f667b22ba5 100644 --- a/examples/gras/mmrpc/Makefile.in +++ b/examples/gras/mmrpc/Makefile.in @@ -175,7 +175,6 @@ 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@ diff --git a/examples/gras/mutual_exclusion/simple_token/Makefile.in b/examples/gras/mutual_exclusion/simple_token/Makefile.in index 6447456bb6..f0306c8a92 100644 --- a/examples/gras/mutual_exclusion/simple_token/Makefile.in +++ b/examples/gras/mutual_exclusion/simple_token/Makefile.in @@ -171,7 +171,6 @@ 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@ diff --git a/examples/gras/ping/Makefile.in b/examples/gras/ping/Makefile.in index c0e970ca72..05b6908791 100644 --- a/examples/gras/ping/Makefile.in +++ b/examples/gras/ping/Makefile.in @@ -175,7 +175,6 @@ 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@ diff --git a/examples/gras/pmm/Makefile.in b/examples/gras/pmm/Makefile.in index 566d905b2f..6ed1171489 100644 --- a/examples/gras/pmm/Makefile.in +++ b/examples/gras/pmm/Makefile.in @@ -171,7 +171,6 @@ 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@ diff --git a/examples/gras/rpc/Makefile.in b/examples/gras/rpc/Makefile.in index 0c643bb37a..d389b9f2c7 100644 --- a/examples/gras/rpc/Makefile.in +++ b/examples/gras/rpc/Makefile.in @@ -174,7 +174,6 @@ 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@ diff --git a/examples/gras/spawn/Makefile.in b/examples/gras/spawn/Makefile.in index e76654bdcb..01dfdddcbe 100644 --- a/examples/gras/spawn/Makefile.in +++ b/examples/gras/spawn/Makefile.in @@ -175,7 +175,6 @@ 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@ diff --git a/examples/gras/synchro/Makefile.in b/examples/gras/synchro/Makefile.in index ef9c9cebab..222beee0d3 100644 --- a/examples/gras/synchro/Makefile.in +++ b/examples/gras/synchro/Makefile.in @@ -168,7 +168,6 @@ 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@ diff --git a/examples/gras/timer/Makefile.in b/examples/gras/timer/Makefile.in index 7bac37a5c3..6afca03542 100644 --- a/examples/gras/timer/Makefile.in +++ b/examples/gras/timer/Makefile.in @@ -166,7 +166,6 @@ 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@ diff --git a/examples/java/Makefile.in b/examples/java/Makefile.in index aa9e8a2864..e3b81e625c 100644 --- a/examples/java/Makefile.in +++ b/examples/java/Makefile.in @@ -139,7 +139,6 @@ 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@ diff --git a/examples/java/basic/Makefile.in b/examples/java/basic/Makefile.in index 445eab7a7c..9c6c5698ce 100644 --- a/examples/java/basic/Makefile.in +++ b/examples/java/basic/Makefile.in @@ -132,7 +132,6 @@ 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@ @@ -198,6 +197,7 @@ target_os = @target_os@ 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 # Declare sources: @@ -206,7 +206,7 @@ noinst_JAVA = Master.java Forwarder.java Slave.java BasicTest.java BasicTask.jav # Declare test class TESTS = BasicTest.class JAVAROOT = . -AM_JAVACFLAGS = -cp $(top_srcdir)/src/simgrid.jar +AM_JAVACFLAGS = -classpath $(top_srcdir)/src/simgrid.jar ########################## # What to do on make check diff --git a/examples/java/comm_time/Makefile.in b/examples/java/comm_time/Makefile.in index afe87065d4..b6cc8f8abf 100644 --- a/examples/java/comm_time/Makefile.in +++ b/examples/java/comm_time/Makefile.in @@ -132,7 +132,6 @@ 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@ @@ -204,7 +203,7 @@ EXTRA_DIST = comm_time_deployment.xml comm_time_platform.xml surfxml.dtd noinst_JAVA = Master.java Slave.java CommTimeTest.java CommTimeTask.java TESTS = CommTimeTest.class JAVAROOT = . -AM_JAVACFLAGS = -cp $(top_srcdir)/src/simgrid.jar +AM_JAVACFLAGS = -classpath $(top_srcdir)/src/simgrid.jar ########################## # What to do on make check diff --git a/examples/java/ping_pong/Makefile.in b/examples/java/ping_pong/Makefile.in index 9e87b9e830..6df5cd18f5 100644 --- a/examples/java/ping_pong/Makefile.in +++ b/examples/java/ping_pong/Makefile.in @@ -132,7 +132,6 @@ 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@ @@ -207,7 +206,7 @@ noinst_JAVA = Sender.java Receiver.java PingPongTask.java PingPongTest.java #if HAVE_JAVA TESTS = PingPongTest.class JAVAROOT = . -AM_JAVACFLAGS = -cp $(top_srcdir)/src/simgrid.jar +AM_JAVACFLAGS = -classpath $(top_srcdir)/src/simgrid.jar ########################## # What to do on make check diff --git a/examples/java/suspend/Makefile.in b/examples/java/suspend/Makefile.in index 4a55161d56..234bc7606d 100644 --- a/examples/java/suspend/Makefile.in +++ b/examples/java/suspend/Makefile.in @@ -132,7 +132,6 @@ 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@ @@ -202,8 +201,12 @@ EXTRA_DIST = suspend_deployment.xml suspend_platform.xml surfxml.dtd # Declare sources: noinst_JAVA = DreamMaster.java LazyGuy.java SuspendTest.java + +# Declare test class +TESTS = SuspendTest.class +XFAIL_TESTS = SuspendTest.class JAVAROOT = . -AM_JAVACFLAGS = -cp $(top_srcdir)/src/simgrid.jar +AM_JAVACFLAGS = -classpath $(top_srcdir)/src/simgrid.jar ########################## # What to do on make check @@ -275,6 +278,79 @@ 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'`; \ @@ -302,6 +378,7 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am all-am: Makefile classnoinst.stamp installdirs: @@ -385,10 +462,10 @@ uninstall-am: .MAKE: install-am install-strip -.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 \ +.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 \ 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 \ @@ -406,9 +483,6 @@ dist-files: @echo @for n in $(DIST_SUBDIRS) ; do if [ x$$n != x. ] ; then $(MAKE) -C $$n dist-files SRCFILE=$(SRCFILE)$$n/ ; fi; done -# Declare test class -# TESTS=SuspendTest.class (broken test) - # Cruft # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/examples/msg/Makefile.in b/examples/msg/Makefile.in index a2b9d62520..ffd27d1fde 100644 --- a/examples/msg/Makefile.in +++ b/examples/msg/Makefile.in @@ -38,13 +38,12 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@HAVE_SDP_TRUE@am__append_1 = sendrecv/sendrecv_KCCFLN05_proportional.tesh -@HAVE_GTNETS_TRUE@am__append_2 = gtnets/gtnets +@HAVE_GTNETS_TRUE@am__append_1 = gtnets/gtnets bin_PROGRAMS = sendrecv/sendrecv$(EXEEXT) suspend/suspend$(EXEEXT) \ masterslave/masterslave$(EXEEXT) \ masterslave/masterslave_forwarder$(EXEEXT) $(am__EXEEXT_1) -@HAVE_GTNETS_TRUE@am__append_3 = gtnets/gtnets -@HAVE_GTNETS_FALSE@am__append_4 = gtnets/gtnets.c +@HAVE_GTNETS_TRUE@am__append_2 = gtnets/gtnets +@HAVE_GTNETS_FALSE@am__append_3 = gtnets/gtnets.c DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/acmacro/dist-files.mk subdir = examples/msg @@ -181,7 +180,6 @@ 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@ @@ -257,16 +255,19 @@ EXTRA_DIST = msg_platform.xml small_platform.xml \ masterslave/deployment_masterslave.xml \ gtnets/r-n200-f50-s4-2-d.xml gtnets/onelink-p.xml \ gtnets/onelink-d.xml gtnets/r-n200-f50-s4-2-p.xml \ - gtnets/dogbone-d.xml gtnets/dogbone-p.xml $(am__append_4) + gtnets/dogbone-d.xml gtnets/dogbone-p.xml $(am__append_3) TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh -TESTS = sendrecv/sendrecv_KCCFLN05.tesh $(am__append_1) \ - sendrecv/sendrecv_KCCFLN05_Vegas.tesh \ - sendrecv/sendrecv_KCCFLN05_Reno.tesh suspend/suspend.tesh \ +TESTS = sendrecv/sendrecv_KCCFLN05.tesh \ + sendrecv/sendrecv_Vegas.tesh \ + sendrecv/sendrecv_Reno.tesh \ + suspend/suspend.tesh \ masterslave/masterslave.tesh \ masterslave/masterslave_forwarder.tesh + +@HAVE_SDP_TRUE@BROKEN_TESTS = sendrecv/sendrecv_SDP.tesh CLEANFILES = sendrecv/*~ sendrecv/sendrecv suspend/*~ suspend/suspend \ masterslave/*~ masterslave/masterslave \ - masterslave/masterslave_forwarder $(am__append_2) + masterslave/masterslave_forwarder $(am__append_1) # sendrecv simple example sendrecv_sendrecv_SOURCES = sendrecv/sendrecv.c diff --git a/examples/simdag/Makefile.in b/examples/simdag/Makefile.in index 31e205f4c5..693e6fa51b 100644 --- a/examples/simdag/Makefile.in +++ b/examples/simdag/Makefile.in @@ -145,7 +145,6 @@ 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@ diff --git a/include/Makefile.in b/include/Makefile.in index db02f63f97..ca90ed12b9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -141,7 +141,6 @@ 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@ diff --git a/src/Makefile.in b/src/Makefile.in index cefabcb593..bd0d6b4f28 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -14,6 +14,11 @@ @SET_MAKE@ +#AM_CFLAGS= -DNDEBUG + +# -DNLOG cuts absolutely all logs at compilation time. +# -DNDEBUG cuts asserts and logs at "trace" and "debug" levels. + # Makefile chunk which allows to display the files which should be included # into the distribution. @@ -353,7 +358,6 @@ 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@ @@ -419,18 +423,6 @@ target_os = @target_os@ target_vendor = @target_vendor@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - -#AM_CPPFLAGS= -AM_CFLAGS = -g -#AM_CFLAGS= -DNDEBUG - -# -DNLOG cuts absolutely all logs at compilation time. -# -DNDEBUG cuts asserts and logs at "trace" and "debug" levels. - -# -g -ffast-math -funroll-loops -O3 -fno-strict-aliasing -# Those should be added by configure when using gcc -# fast-math is nasty when using IEEE floating point semantic -# strict-aliasing breaks my type-punning bad habit. MAINTAINERCLEANFILES = Makefile.in INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/include EXTRA_DIST = portable.h xbt/mallocator_private.h xbt/dynar_private.h \ diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index 24271d23f3..fd488c53f9 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -212,7 +212,6 @@ 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@ diff --git a/tools/Makefile.in b/tools/Makefile.in index 5ba628955b..c4bbeb7f9a 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -139,7 +139,6 @@ 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@ diff --git a/tools/gras/Makefile.in b/tools/gras/Makefile.in index e3bad7424d..bb4ac3c7f5 100644 --- a/tools/gras/Makefile.in +++ b/tools/gras/Makefile.in @@ -150,7 +150,6 @@ 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@ diff --git a/tools/tesh/Makefile.in b/tools/tesh/Makefile.in index 30f52e47a5..40815b1f40 100644 --- a/tools/tesh/Makefile.in +++ b/tools/tesh/Makefile.in @@ -150,7 +150,6 @@ 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@ -- 2.20.1