Welcome to modernity, testing infrastructure

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2074 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/amok/saturate/Makefile.am b/examples/amok/saturate/Makefile.am
index 0ade892..3c4c599 100644 (file)
--- a/examples/amok/saturate/Makefile.am
+++ b/examples/amok/saturate/Makefile.am
@@ -2,9 +2,9 @@ INCLUDES= -I$(top_srcdir)/include
 AM_CFLAGS=-g
 
 TESTS=test_rl test_sg
-EXTRA_DIST=saturate_deployment.txt $(TESTS)
+EXTRA_DIST=saturate_deployment.xml $(TESTS)
 
-check_PROGRAMS=saturate_simulator saturate_sensor saturate_maestro
+noinst_PROGRAMS=saturate_simulator saturate_sensor saturate_maestro
 
 saturate_simulator_SOURCES=_saturate_simulator.c saturate.c
 saturate_simulator_LDADD=      $(top_builddir)/src/libsimgrid.la
@@ -12,14 +12,13 @@ saturate_simulator_LDADD=   $(top_builddir)/src/libsimgrid.la
 saturate_sensor_SOURCES=          _saturate_sensor.c saturate.c
 saturate_maestro_SOURCES=         _saturate_maestro.c saturate.c
 
-saturate_sensor_LDADD=            $(top_srcdir)/src/libgras.la # $(top_srcdir)/src/modules/libgrasmodules.a
-saturate_maestro_LDADD=          $(top_srcdir)/src/libgras.la # $(top_srcdir)/src/modules/libgrasmodules.a
+saturate_sensor_LDADD=            $(top_srcdir)/src/libgras.la # $(top_srcdir)/src/modules/libgras.a
+saturate_maestro_LDADD=          $(top_srcdir)/src/libgras.la # $(top_srcdir)/src/modules/libgras.a
 
 # Take care of generatated sources
 NAME=saturate
 PROCESSES=sensor maestro
 include $(top_srcdir)/examples/temps-gras-stub.mk
 
-
-
-
+# Cruft
+include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/examples/amok/saturate/test_sg.in b/examples/amok/saturate/test_sg.in
index b80ebfd..31d7128 100755 (executable)
--- a/examples/amok/saturate/test_sg.in
+++ b/examples/amok/saturate/test_sg.in
@@ -1,5 +1,9 @@
 #! @BASH@
-if test -x ./saturate_simulator ; then
-  exec ./saturate_simulator @srcdir@/../WAN_3.platform.txt @srcdir@/saturate_deployment.txt
+if [ x@EXEEXT@ = x ] ; then
+#  exenv="libtool --mode=execute valgrind"
+  exenv=$SG_TEST_EXENV
+else
+  exenv=wine
 fi
-exit 77
+
+exec $exenv ./saturate_simulator@EXEEXT@ @top_srcdir@/examples/msg/small_platform.xml @srcdir@/saturate_deployment.xml $@