Fix Arnaud's changes (niark niark): some gras stuff is still in src/ and not in src...

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

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index bf2a988..07e6096 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/include 
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include

 AM_CFLAGS=-g
 
 CLEANFILES = *~ test a.out *.o gras/datadesc_usage.out datadesc_usage.out
 AM_CFLAGS=-g
 
 CLEANFILES = *~ test a.out *.o gras/datadesc_usage.out datadesc_usage.out

diff --git a/testsuite/run_tests.in b/testsuite/run_tests.in
index 2e23c4d..57c7ed7 100755 (executable)
--- a/testsuite/run_tests.in
+++ b/testsuite/run_tests.in
@@ -41,7 +41,9 @@ msg_TESTS=" msg/msg_test@EXEEXT@ --surf-path=@top_srcdir@/examples/msg/;"
 
 gras_TESTS="gras/trp_tcp_usage;      gras/trp_file_usage;                       \
            gras/datadesc_usage@EXEEXT@;                                        \
 
 gras_TESTS="gras/trp_tcp_usage;      gras/trp_file_usage;                       \
            gras/datadesc_usage@EXEEXT@;                                        \

-           gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.little32; \
+          "
+          
+gras_ignored="gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.little32; \

            gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.little64; \
            gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.big32;    \
            gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.big64;    \
            gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.little64; \
            gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.big32;    \
            gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.big64;    \


@@ -56,8 +58,7 @@ gras_TESTS="gras/trp_tcp_usage;      gras/trp_file_usage;
 # we split tests on ';' so that they can contain spaces (test=accumulator)
 test=""
 
 # we split tests on ';' so that they can contain spaces (test=accumulator)
 test=""
 

-for testpart in $xbt_TESTS $surf_TESTS $msg_TESTS 
-# gras_TESTS
+for testpart in $xbt_TESTS $msg_TESTS $gras_TESTS # $surf_TESTS 

 do
   test="$test $testpart"
   if echo $test | grep ';' ; then
 do
   test="$test $testpart"
   if echo $test | grep ';' ; then