X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d443c53694a5b52c9e75352f82bfef50735e939e..7fabb9914081a3925f380812e1289ee322b694ee:/examples/msg/Makefile.am

diff --git a/examples/msg/Makefile.am b/examples/msg/Makefile.am
index 62dc50f1d6..2b4286c614 100644
--- a/examples/msg/Makefile.am
+++ b/examples/msg/Makefile.am
@@ -18,16 +18,30 @@ EXTRA_DIST = msg_platform.xml \
              masterslave/deployment_masterslave_forwarder.xml \
              masterslave/deployment_masterslave.xml \
              migration/migration.deploy \
-             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 \
+             gtnets/waxman-d.xml \
+             gtnets/waxman-p.xml \
              parallel_task/test_ptask_deployment.xml \
              parallel_task/test_ptask_platform.xml \
              priority/deployment_priority.xml \
-             properties/deployment_properties.xml
+             properties/deployment_properties.xml \
+             trace/test_trace_integration.xml \
+             trace/file.trace \
+             trace/test1.xml \
+             trace/test2.xml \
+             trace/test3.xml \
+             trace/test4.xml \
+             trace/test5.xml \
+             trace/test6.xml \
+             trace/test7.xml \
+             trace/test8.xml \
+             trace/test9.xml \
+             trace/test10.xml \
+             trace/test11.xml \
+	     fafard_state.trace jupiter_state.trace link5_state.trace
 
 
 TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh
@@ -44,12 +58,10 @@ TESTS = sendrecv/sendrecv_CLM03.tesh \
         migration/migration.tesh \
         parallel_task/parallel_task.tesh \
         priority/priority.tesh \
-	properties/msg_prop.tesh
+	properties/msg_prop.tesh \
+    trace/trace.tesh \
+	masterslave/masterslave_cpu_ti.tesh
 
-
-if HAVE_SDP
-  BROKEN_TESTS = sendrecv/sendrecv_SDP.tesh
-endif
 if HAVE_GTNETS
   TESTS += gtnets/gtnets.tesh
 endif
@@ -65,10 +77,11 @@ CLEANFILES = sendrecv/*~ \
              parallel_task/parallel_task \
              parallel_task/test_ptask \
              priority/priority \
-             properties/msg_prop
+             properties/msg_prop \
+             trace/test_trace_integration
 
 if HAVE_GTNETS
-             CLEANFILES += gtnets/gtnets gtnets/gtnets_kayo
+             CLEANFILES += gtnets/gtnets
 endif
 
 
@@ -76,6 +89,7 @@ endif
 
 noinst_PROGRAMS = sendrecv/sendrecv \
                   suspend/suspend \
+                  masterslave/masterslave_mailbox \
                   masterslave/masterslave_forwarder \
                   masterslave/masterslave_failure \
                   masterslave/masterslave_bypass \
@@ -84,10 +98,11 @@ noinst_PROGRAMS = sendrecv/sendrecv \
                   parallel_task/test_ptask \
                   priority/priority \
                   properties/msg_prop \
-                  actions/actions
+                  actions/actions \
+                  trace/test_trace_integration
 
 if HAVE_GTNETS
-  noinst_PROGRAMS += gtnets/gtnets gtnets/gtnets_kayo
+  noinst_PROGRAMS += gtnets/gtnets
 endif
 
 
@@ -126,6 +141,10 @@ priority_priority_LDADD   = $(top_builddir)/src/libsimgrid.la
 masterslave_masterslave_forwarder_SOURCES = masterslave/masterslave_forwarder.c
 masterslave_masterslave_forwarder_LDADD   = $(top_builddir)/src/libsimgrid.la
 
+# master/slave application example using a mailboxes
+masterslave_masterslave_mailbox_SOURCES = masterslave/masterslave_mailbox.c
+masterslave_masterslave_mailbox_LDADD   = $(top_builddir)/src/libsimgrid.la
+
 # master/slave application example with failures
 masterslave_masterslave_failure_SOURCES = masterslave/masterslave_failure.c
 masterslave_masterslave_failure_LDADD   = $(top_builddir)/src/libsimgrid.la
@@ -134,14 +153,16 @@ masterslave_masterslave_failure_LDADD   = $(top_builddir)/src/libsimgrid.la
 masterslave_masterslave_bypass_SOURCES = masterslave/masterslave_bypass.c
 masterslave_masterslave_bypass_LDADD   = $(top_builddir)/src/libsimgrid.la
 
+# bypass the surf xml parser
+trace_test_trace_integration_SOURCES = trace/test_trace_integration.c
+trace_test_trace_integration_LDADD   = $(top_builddir)/src/libsimgrid.la
+
 # verify if the GTNETS feature is working
 if HAVE_GTNETS
 gtnets_gtnets_SOURCES  = gtnets/gtnets.c
-gtnets_gtnets_kayo_SOURCES  = gtnets/gtnets_kayo.c
 gtnets_gtnets_LDADD   = $(top_builddir)/src/libsimgrid.la
-gtnets_gtnets_kayo_LDADD   = $(top_builddir)/src/libsimgrid.la
 else
-  EXTRA_DIST+= gtnets/gtnets.c gtnets/gtnets_kayo.c
+  EXTRA_DIST+= gtnets/gtnets.c
 endif
 
 EXTRA_DIST+=$(TESTS)