X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/93425711d72657a979fd9188202ec63a35574fb5..cef1fafa57eaa4f16e9151ad1130aadc4fe663ef:/examples/msg/Makefile.am

diff --git a/examples/msg/Makefile.am b/examples/msg/Makefile.am
index 9e90778ec1..9bc9b61a04 100644
--- a/examples/msg/Makefile.am
+++ b/examples/msg/Makefile.am
@@ -17,16 +17,30 @@ EXTRA_DIST = msg_platform.xml \
              suspend/deployment_suspend.xml \
              masterslave/deployment_masterslave_forwarder.xml \
              masterslave/deployment_masterslave.xml \
-             gtnets/r-n200-f50-s4-2-d.xml \
+             migration/migration.deploy \
              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
 
 
 TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh
@@ -40,14 +54,13 @@ TESTS = sendrecv/sendrecv_CLM03.tesh \
 	masterslave/masterslave_forwarder.tesh \
 	masterslave/masterslave_failure.tesh \
         masterslave/masterslave_bypass.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
@@ -63,10 +76,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 
+             CLEANFILES += gtnets/gtnets
 endif
 
 
@@ -77,13 +91,16 @@ noinst_PROGRAMS = sendrecv/sendrecv \
                   masterslave/masterslave_forwarder \
                   masterslave/masterslave_failure \
                   masterslave/masterslave_bypass \
+                  migration/migration \
                   parallel_task/parallel_task \
                   parallel_task/test_ptask \
                   priority/priority \
-                  properties/msg_prop
+                  properties/msg_prop \
+                  actions/actions \
+                  trace/test_trace_integration
 
 if HAVE_GTNETS
-  noinst_PROGRAMS += gtnets/gtnets 
+  noinst_PROGRAMS += gtnets/gtnets
 endif
 
 
@@ -91,6 +108,14 @@ endif
 properties_msg_prop_SOURCES = properties/msg_prop.c
 properties_msg_prop_LDADD   = $(top_builddir)/src/libsimgrid.la
 
+# actions example
+actions_actions_SOURCES = actions/actions.c
+actions_actions_LDADD   = $(top_builddir)/src/libsimgrid.la
+
+# migration example
+migration_migration_SOURCES = migration/migration.c
+migration_migration_LDADD   = $(top_builddir)/src/libsimgrid.la
+
 
 # sendrecv simple example
 sendrecv_sendrecv_SOURCES = sendrecv/sendrecv.c
@@ -122,9 +147,13 @@ 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_SOURCES  = gtnets/gtnets.c
 gtnets_gtnets_LDADD   = $(top_builddir)/src/libsimgrid.la
 else
   EXTRA_DIST+= gtnets/gtnets.c