From b98502d1393e861e4173c1dd841e892761bcbb34 Mon Sep 17 00:00:00 2001 From: mquinson Date: Tue, 3 Jun 2008 20:53:20 +0000 Subject: [PATCH 1/1] Well. Some of the tests do not fail git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5511 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/amok/Makefile.am | 10 +++++++--- examples/amok/Makefile.in | 9 ++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/examples/amok/Makefile.am b/examples/amok/Makefile.am index 0ddf956311..c9d2ba550b 100644 --- a/examples/amok/Makefile.am +++ b/examples/amok/Makefile.am @@ -27,6 +27,7 @@ if GRAS_ARCH_32_BITS else TESTS += bandwidth/bandwidth_rl.tesh bandwidth/bandwidth_sg_64.tesh endif +XFAIL_TESTS+=bandwidth/bandwidth_rl.tesh noinst_PROGRAMS += \ bandwidth/bandwidth_maestro \ @@ -52,10 +53,14 @@ bandwidth/_bandwidth_simulator.c bandwidth/_bandwidth_sensor.c bandwidth/_bandwi EXTRA_DIST+=saturate/saturate.xml if GRAS_ARCH_32_BITS - TESTS += saturate/saturate_rl.tesh saturate/saturate_sg_32.tesh + TESTS += saturate/saturate_rl.tesh saturate/saturate_sg_32.tesh + XFAIL_TESTS += saturate/saturate_rl.tesh saturate/saturate_sg_32.tesh else - TESTS += saturate/saturate_rl.tesh saturate/saturate_sg_64.tesh + TESTS += saturate/saturate_rl.tesh saturate/saturate_sg_64.tesh + XFAIL_TESTS += saturate/saturate_rl.tesh saturate/saturate_sg_64.tesh endif + + noinst_PROGRAMS += \ saturate/saturate_maestro \ saturate/saturate_sensor \ @@ -80,5 +85,4 @@ saturate/_saturate_simulator.c saturate/_saturate_sensor.c saturate/_saturate_ma # Cruft # ######### EXTRA_DIST+=$(TESTS) -XFAIL_TESTS+=$(TESTS) include $(top_srcdir)/acmacro/dist-files.mk diff --git a/examples/amok/Makefile.in b/examples/amok/Makefile.in index 6db7a36c07..47bcb4762c 100644 --- a/examples/amok/Makefile.in +++ b/examples/amok/Makefile.in @@ -53,7 +53,9 @@ noinst_PROGRAMS = bandwidth/bandwidth_maestro$(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 +@GRAS_ARCH_32_BITS_TRUE@am__append_4 = saturate/saturate_rl.tesh saturate/saturate_sg_32.tesh +@GRAS_ARCH_32_BITS_FALSE@am__append_5 = saturate/saturate_rl.tesh saturate/saturate_sg_64.tesh +@GRAS_ARCH_32_BITS_FALSE@am__append_6 = 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 @@ -284,8 +286,9 @@ AM_CFLAGS = -g EXTRA_DIST = bandwidth/bandwidth.xml saturate/saturate.xml $(TESTS) TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh TESTS = $(am__append_1) $(am__append_2) $(am__append_3) \ - $(am__append_4) -XFAIL_TESTS = $(TESTS) + $(am__append_5) +XFAIL_TESTS = bandwidth/bandwidth_rl.tesh $(am__append_4) \ + $(am__append_6) LDADD_SG = $(top_builddir)/src/libsimgrid.la LDADD_RL = $(top_builddir)/src/libgras.la bandwidth_bandwidth_simulator_SOURCES = bandwidth/bandwidth.c bandwidth/_bandwidth_simulator.c -- 2.20.1