X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/09c8124a61c40287d7f4e0690eb723808491ebc1..aabd210b4d26517b0b8df0967bdf51181d37a5ca:/teshsuite/Makefile.am

diff --git a/teshsuite/Makefile.am b/teshsuite/Makefile.am
index 5ef60e1db3..2f85a79bd7 100644
--- a/teshsuite/Makefile.am
+++ b/teshsuite/Makefile.am
@@ -77,7 +77,9 @@ gras/datadesc/datadesc_structs.c: gras/datadesc/mk_datadesc_structs.pl
 
   ## Ensures the gras_msg_handle semantic ##
   ##########################################
-EXTRA_DIST += gras/msg_handle/msg_handle.xml
+EXTRA_DIST += gras/msg_handle/msg_handle.xml \
+              gras/msg_handle/test_rl \
+	      gras/msg_handle/test_sg_32 gras/msg_handle/test_sg_64
 noinst_PROGRAMS+=\
   gras/msg_handle/msg_handle_client \
   gras/msg_handle/msg_handle_server \
@@ -94,7 +96,7 @@ gras_msg_handle_msg_handle_server_LDADD=      $(LDADD_RL)
 gras/msg_handle/_msg_handle_simulator.c gras/msg_handle/_msg_handle_client.c gras/msg_handle/_msg_handle_server.c : gras/msg_handle/msg_handle.c gras/msg_handle/msg_handle.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@
 	mkdir -p gras/msg_handle; \
 	  cd gras/msg_handle;\
-	  ../../$(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ msg_handle ../../$(top_srcdir)/teshsuite/gras/msg_handle/msg_handle.xml
+	  $(abs_top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ msg_handle $(abs_top_srcdir)/teshsuite/gras/msg_handle/msg_handle.xml
 
 
 if GRAS_ARCH_32_BITS
@@ -105,7 +107,8 @@ endif
 
   ## Make sure it's ok to have empty main functions ##
   ####################################################
-EXTRA_DIST += gras/empty_main/empty_main.xml
+EXTRA_DIST += gras/empty_main/empty_main.xml \
+              gras/empty_main/test_rl gras/empty_main/test_sg
 noinst_PROGRAMS+=\
   gras/empty_main/empty_main_function \
   gras/empty_main/empty_main_simulator
@@ -119,13 +122,14 @@ gras_empty_main_empty_main_function_LDADD=    $(LDADD_RL)
 gras/empty_main/_empty_main_simulator.c gras/empty_main/_empty_main_function.c : gras/empty_main/empty_main.c gras/empty_main/empty_main.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@
 	mkdir -p gras/empty_main; \
 	  cd gras/empty_main;\
-	  ../../$(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ empty_main ../../$(top_srcdir)/teshsuite/gras/empty_main/empty_main.xml
+	  $(abs_top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ empty_main $(abs_top_srcdir)/teshsuite/gras/empty_main/empty_main.xml
 
 TESTS += gras/empty_main/test_rl gras/empty_main/test_sg
 
-  ## Make sure it's ok to have very small sleeps ##
-  #################################################
-EXTRA_DIST += gras/small_sleep/small_sleep.xml
+  ## Make sure it's ok to have very small sleeps (not meant for real life) ##
+  ###########################################################################
+EXTRA_DIST += gras/small_sleep/small_sleep.xml \
+              gras/small_sleep/test_sg_32 gras/small_sleep/test_sg_64
 noinst_PROGRAMS+=\
   gras/small_sleep/small_sleep_function \
   gras/small_sleep/small_sleep_simulator
@@ -139,10 +143,13 @@ gras_small_sleep_small_sleep_function_LDADD=    $(LDADD_RL)
 gras/small_sleep/_small_sleep_simulator.c gras/small_sleep/_small_sleep_function.c : gras/small_sleep/small_sleep.c gras/small_sleep/small_sleep.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@
 	mkdir -p gras/small_sleep; \
 	  cd gras/small_sleep;\
-	  ../../$(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ small_sleep ../../$(top_srcdir)/teshsuite/gras/small_sleep/small_sleep.xml
+	  $(abs_top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ small_sleep $(abs_top_srcdir)/teshsuite/gras/small_sleep/small_sleep.xml
 
-TESTS += gras/small_sleep/test_sg
-# gras/small_sleep/test_rl don't test on RL!!
+if GRAS_ARCH_32_BITS
+  TESTS += gras/small_sleep/test_sg_32
+else
+  TESTS += gras/small_sleep/test_sg_64
+endif
 
 ###################################
 # network model test via SimDag API