Yeah, right. 64bits architectures produce a different output

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

diff --git a/examples/amok/Makefile.am b/examples/amok/Makefile.am
index 9a2d98b..d1968c2 100644 (file)
--- a/examples/amok/Makefile.am
+++ b/examples/amok/Makefile.am
@@ -15,7 +15,11 @@ LDADD_RL=$(top_builddir)/src/libgras.la
 # Bandwidth tests #
 ###################
 EXTRA_DIST+=bandwidth/bandwidth.xml
-TESTS += bandwidth/bandwidth_rl.tesh bandwidth/bandwidth_sg.tesh
+if GRAS_ARCH_32_BITS
+  TESTS += bandwidth/bandwidth_rl.tesh bandwidth/bandwidth_sg_32.tesh
+else
+  TESTS += bandwidth/bandwidth_rl.tesh bandwidth/bandwidth_sg_64.tesh
+endif
 
 noinst_PROGRAMS += \
   bandwidth/bandwidth_maestro   \
@@ -39,8 +43,12 @@ bandwidth/_bandwidth_simulator.c bandwidth/_bandwidth_sensor.c bandwidth/_bandwi
 # saturate tests #
 ###################
 EXTRA_DIST+=saturate/saturate.xml
-TESTS += saturate/saturate_rl.tesh saturate/saturate_sg.tesh
 
+if GRAS_ARCH_32_BITS
+  TESTS += saturate/saturate_rl.tesh saturate/saturate_sg_32.tesh
+else
+  TESTS += saturate/saturate_rl.tesh saturate/saturate_sg_64.tesh
+endif
 noinst_PROGRAMS += \
   saturate/saturate_maestro   \
   saturate/saturate_sensor    \

diff --git a/examples/amok/Makefile.in b/examples/amok/Makefile.in
index 47093b6..6cb1c67 100644 (file)
--- a/examples/amok/Makefile.in
+++ b/examples/amok/Makefile.in
@@ -44,6 +44,10 @@ noinst_PROGRAMS = bandwidth/bandwidth_maestro$(EXEEXT) \
        saturate/saturate_maestro$(EXEEXT) \
        saturate/saturate_sensor$(EXEEXT) \
        saturate/saturate_simulator$(EXEEXT)
+@GRAS_ARCH_32_BITS_TRUE@am__append_1 = bandwidth/bandwidth_rl.tesh bandwidth/bandwidth_sg_32.tesh
+@GRAS_ARCH_32_BITS_FALSE@am__append_2 = bandwidth/bandwidth_rl.tesh bandwidth/bandwidth_sg_64.tesh
+@GRAS_ARCH_32_BITS_TRUE@am__append_3 = saturate/saturate_rl.tesh saturate/saturate_sg_32.tesh
+@GRAS_ARCH_32_BITS_FALSE@am__append_4 = saturate/saturate_rl.tesh saturate/saturate_sg_64.tesh
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/acmacro/dist-files.mk
 subdir = examples/amok
@@ -267,8 +271,8 @@ AM_CFLAGS = -g
 ###################
 EXTRA_DIST = bandwidth/bandwidth.xml saturate/saturate.xml
 TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh
-TESTS = bandwidth/bandwidth_rl.tesh bandwidth/bandwidth_sg.tesh \
-       saturate/saturate_rl.tesh saturate/saturate_sg.tesh
+TESTS = $(am__append_1) $(am__append_2) $(am__append_3) \
+       $(am__append_4)
 XFAIL_TESTS = 
 LDADD_SG = $(top_builddir)/src/libsimgrid.la
 LDADD_RL = $(top_builddir)/src/libgras.la

diff --git a/examples/amok/bandwidth/bandwidth_sg.tesh b/examples/amok/bandwidth/bandwidth_sg_32.tesh
similarity index 100%
rename from examples/amok/bandwidth/bandwidth_sg.tesh
rename to examples/amok/bandwidth/bandwidth_sg_32.tesh

diff --git a/examples/amok/bandwidth/bandwidth_sg_64.tesh b/examples/amok/bandwidth/bandwidth_sg_64.tesh
new file mode 100644 (file)
index 0000000..13dd117
--- /dev/null
+++ b/examples/amok/bandwidth/bandwidth_sg_64.tesh
@@ -0,0 +1,13 @@
+$ $SG_TEST_EXENV bandwidth/bandwidth_simulator${EXEEXT} ${srcdir:=.}/../msg/small_platform.xml ${srcdir:=.}/bandwidth/bandwidth.xml
+> [Tremblay:sensor:(1) 0.000000] [Bandwidth/INFO] Sensor starting (on port 3000)
+> [Jupiter:sensor:(2) 0.000000] [Bandwidth/INFO] Sensor starting (on port 3000)
+> [Ginette:maestro:(3) 0.000000] [Bandwidth/INFO] Maestro starting
+> [Ginette:maestro:(3) 0.000000] [Bandwidth/INFO] Wait for peers for 5 sec
+> [Ginette:maestro:(3) 5.000000] [Bandwidth/INFO] Contact Tremblay:3000
+> [Ginette:maestro:(3) 5.000000] [Bandwidth/INFO] Test the BW between me and one of the sensors
+> [Ginette:maestro:(3) 6.137747] [Bandwidth/INFO] Experience between me and Tremblay:3000 (initially 1 msgs of 524288 bytes, maybe modified to fill the pipe at least 1.0s) took 1.062123 sec, achieving 7657.304762 kb/s
+> [Ginette:maestro:(3) 6.137747] [Bandwidth/INFO] Test the BW between Tremblay:3000 and Jupiter:3000
+> [Ginette:maestro:(3) 7.289673] [Bandwidth/INFO] Experience between Tremblay:3000 and Jupiter:3000 took took 1.062501 sec, achieving 6663.458290 kb/s
+> [Ginette:maestro:(3) 7.293679] [gras/INFO] Exiting GRAS
+> [Jupiter:sensor:(2) 7.293679] [gras/INFO] Exiting GRAS
+> [Tremblay:sensor:(1) 8.289673] [gras/INFO] Exiting GRAS

diff --git a/examples/amok/saturate/saturate_sg.tesh b/examples/amok/saturate/saturate_sg_32.tesh
similarity index 100%
rename from examples/amok/saturate/saturate_sg.tesh
rename to examples/amok/saturate/saturate_sg_32.tesh

diff --git a/examples/amok/saturate/saturate_sg_64.tesh b/examples/amok/saturate/saturate_sg_64.tesh
new file mode 100644 (file)
index 0000000..f27e195
--- /dev/null
+++ b/examples/amok/saturate/saturate_sg_64.tesh
@@ -0,0 +1,17 @@
+$ $SG_TEST_EXENV saturate/saturate_simulator${EXEEXT} ${srcdir:=.}/../msg/small_platform.xml ${srcdir:=.}/saturate/saturate.xml
+> [Tremblay:sensor:(1) 0.000000] [saturate/INFO] Sensor starting (on port 3000)
+> [Jupiter:sensor:(2) 0.000000] [saturate/INFO] Sensor starting (on port 3000)
+> [Fafard:sensor:(3) 0.000000] [saturate/INFO] Sensor starting (on port 3000)
+> [Ginette:sensor:(4) 0.000000] [saturate/INFO] Sensor starting (on port 3000)
+> [Ginette:sensor:(4) 5.001239] [gras/INFO] Exiting GRAS
+> [Bourassa:maestro:(5) 5.001760] [saturate/INFO] Start saturation between Tremblay:3000 and Jupiter:3000
+> [Fafard:sensor:(3) 5.001760] [gras/INFO] Exiting GRAS
+> [Bourassa:maestro:(5) 5.005674] [saturate/INFO] Have a rest
+> [Bourassa:maestro:(5) 6.005674] [saturate/INFO] Stop the saturation
+> [Tremblay:sensor:(1) 6.157974] [amok_bw_sat/INFO] Saturation(Tremblay:3000->Jupiter:3000) started
+> [Tremblay:sensor:(1) 12.156685] [amok_bw_sat/INFO] Saturation from Tremblay:3000 to Jupiter:3000 stopped by Bourassa:4000
+> [Bourassa:maestro:(5) 12.158644] [saturate/INFO] Saturation took 6.00sec, achieving 1137474.676347b/s
+> [Tremblay:sensor:(1) 12.160599] [gras/INFO] Exiting GRAS
+> [Bourassa:maestro:(5) 12.164016] [gras/INFO] Exiting GRAS
+> [Jupiter:sensor:(2) 72.156685] [amok_bw_sat/INFO] Saturation comming from Tremblay:3000 stopped on Jupiter:3000
+> [Jupiter:sensor:(2) 72.156685] [gras/INFO] Exiting GRAS