Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

diff --git a/src/simix/BoostContext.cpp b/src/simix/BoostContext.cpp
index 3a7ea34..8af1011 100644 (file)
--- a/src/simix/BoostContext.cpp
+++ b/src/simix/BoostContext.cpp
@@ -290,6 +290,7 @@ void BoostParallelContext::resume()
 
 XBT_PRIVATE ContextFactory* boost_factory()
 {
+  XBT_VERB("Using Boost contexts. Welcome to the 21th century.");
   return new BoostContextFactory();
 }
 

diff --git a/src/simix/RawContext.cpp b/src/simix/RawContext.cpp
index 6c86829..d131015 100644 (file)
--- a/src/simix/RawContext.cpp
+++ b/src/simix/RawContext.cpp
@@ -72,8 +72,7 @@ private:
 
 ContextFactory* raw_factory()
 {
-  XBT_VERB("Using raw contexts. "
-    "Because the glibc is just not good enough for us.");
+  XBT_VERB("Using raw contexts. Because the glibc is just not good enough for us.");
   return new RawContextFactory();
 }
 

diff --git a/tools/cmake/scripts/generate_memcheck_tests.pl b/tools/cmake/scripts/generate_memcheck_tests.pl
index 130b0c3..f8ea4e9 100755 (executable)
--- a/tools/cmake/scripts/generate_memcheck_tests.pl
+++ b/tools/cmake/scripts/generate_memcheck_tests.pl
@@ -21,12 +21,12 @@ open MAKETEST, $ARGV[1] or die "Unable to open file: \"$ARGV[1]\". $!\n";
 sub var_subst {
     my ($text, $name, $value) = @_;
     if ($value) {
-        $text =~ s/\${$name(?::[=-][^}]*)?}/$value/g;
+        $text =~ s/\$\{$name(?::[=-][^}]*)?\}/$value/g;
         $text =~ s/\$$name(\W|$)/$value$1/g;
     }
     else {
-        $text =~ s/\${$name:=([^}]*)}/$1/g;
-        $text =~ s/\${$name}//g;
+        $text =~ s/\$\{$name:=([^}]*)\}/$1/g;
+        $text =~ s/\$\{$name}//g;
         $text =~ s/\$$name(\W|$)/$1/g;
     }
     return $text;
@@ -88,7 +88,7 @@ while ( defined( $line = <MAKETEST> ) ) {
             if ( $line =~ /(\S+)\s*\)$/ ) {
                 $tesh_file = $1;
                 $tesh_file =~ s/^[^\/\$]/$path\/$&/;
-                $tesh_file =~ s/\${CMAKE_HOME_DIRECTORY}/$proj_dir/g;
+                $tesh_file =~ s/\$\{CMAKE_HOME_DIRECTORY\}/$proj_dir/g;
                 if ( ! -e "$tesh_file" ) {
                     print "# tesh_file: $tesh_file does not exist!\n";
                     print "# $line\n";

diff --git a/tools/cmake/src/internal_config.h.in b/tools/cmake/src/internal_config.h.in
index 590c80f..a2afe65 100644 (file)
--- a/tools/cmake/src/internal_config.h.in
+++ b/tools/cmake/src/internal_config.h.in
@@ -9,17 +9,17 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 /* Non-standard header files */
-#cmakedefine HAVE_EXECINFO_H          @HAVE_EXECINFO_H@           /* <execinfo.h> */
-#cmakedefine HAVE_FUTEX_H             @HAVE_FUTEX_H@              /* <linux/futex.h> */
-#cmakedefine HAVE_SIGNAL_H            @HAVE_SIGNAL_H@             /* <signal.h> */
-#cmakedefine HAVE_UNISTD_H            @HAVE_UNISTD_H@             /* <unistd.h>    */
-#cmakedefine HAVE_UCONTEXT_H          @HAVE_UCONTEXT_H@           /* <ucontext.h>  */
-#cmakedefine HAVE_VALGRIND_VALGRIND_H @HAVE_VALGRIND_VALGRIND_H@  /* <valgrind/valgrind.h> */
+#cmakedefine HAVE_EXECINFO_H          @HAVE_EXECINFO_H@ /* <execinfo.h> */
+#cmakedefine HAVE_FUTEX_H             @HAVE_FUTEX_H@ /* <linux/futex.h> */
+#cmakedefine HAVE_SIGNAL_H            @HAVE_SIGNAL_H@ /* <signal.h> */
+#cmakedefine HAVE_UNISTD_H            @HAVE_UNISTD_H@ /* <unistd.h>    */
+#cmakedefine HAVE_UCONTEXT_H          @HAVE_UCONTEXT_H@ /* <ucontext.h>  */
+#cmakedefine HAVE_VALGRIND_VALGRIND_H @HAVE_VALGRIND_VALGRIND_H@ /* <valgrind/valgrind.h> */
 
 /* Time portability */
-#cmakedefine HAVE_GETTIMEOFDAY  @HAVE_GETTIMEOFDAY@  /* Function gettimeofday */
+#cmakedefine HAVE_GETTIMEOFDAY  @HAVE_GETTIMEOFDAY@ /* Function gettimeofday */
 #cmakedefine HAVE_POSIX_GETTIME @HAVE_POSIX_GETTIME@ /* Function clock_gettime */
-#cmakedefine HAVE_NANOSLEEP     @HAVE_NANOSLEEP@     /* Function nanosleep */
+#cmakedefine HAVE_NANOSLEEP     @HAVE_NANOSLEEP@ /* Function nanosleep */
 
 /* The usable context factories */
 #cmakedefine HAVE_BOOST_CONTEXTS    @HAVE_BOOST_CONTEXTS@
@@ -28,13 +28,13 @@
 #cmakedefine HAVE_UCONTEXT_CONTEXTS @HAVE_UCONTEXT_CONTEXTS@
 
 /* Variables for the thread contexts (and parallel mode of raw contexts) */
-#cmakedefine HAVE_PTHREAD @HAVE_PTHREAD@ /* Define to 1 if threads are usable . */
-#cmakedefine HAVE_PTHREAD_SETAFFINITY @HAVE_PTHREAD_SETAFFINITY@ /* Does not seems defined on Mac nor Windows */
+#cmakedefine HAVE_PTHREAD              @HAVE_PTHREAD@ /* Define to 1 if threads are usable . */
+#cmakedefine HAVE_PTHREAD_SETAFFINITY  @HAVE_PTHREAD_SETAFFINITY@ /* Does not seems defined on Mac nor Windows */
 #cmakedefine HAVE_THREAD_LOCAL_STORAGE @HAVE_THREAD_LOCAL_STORAGE@ /* If __thread is available */
 
 /* Variables for the raw contexts (to select the right assembly code) */
-#cmakedefine PROCESSOR_i686 @PROCESSOR_i686@
-#cmakedefine PROCESSOR_x86_64 @PROCESSOR_x86_64@
+#cmakedefine PROCESSOR_i686         @PROCESSOR_i686@
+#cmakedefine PROCESSOR_x86_64       @PROCESSOR_x86_64@
 #cmakedefine CMAKE_SYSTEM_PROCESSOR @CMAKE_SYSTEM_PROCESSOR@
 
 /* Variables for the SysV contexts */
@@ -45,10 +45,10 @@
 #cmakedefine PTH_STACKGROWTH @PTH_STACKGROWTH@ /* Does the stack growth upward, or downward? */
 
 /* MC variables */
-#cmakedefine HAVE_GETDTABLESIZE    @HAVE_GETDTABLESIZE@    /* getdtablesize: get descriptor table size */
-#cmakedefine HAVE_MMALLOC          @HAVE_MMALLOC@          /* Did we compile mmalloc in? */
+#cmakedefine HAVE_GETDTABLESIZE    @HAVE_GETDTABLESIZE@ /* getdtablesize: get descriptor table size */
+#cmakedefine HAVE_MMALLOC          @HAVE_MMALLOC@ /* Did we compile mmalloc in? */
 #cmakedefine HAVE_PROCESS_VM_READV @HAVE_PROCESS_VM_READV@ /* process_vm_readv: transfer data between process address spaces */
-#cmakedefine HAVE_MC @HAVE_MC@ /* Set to true if enable_model-checking is true and the dependencies available */
+#cmakedefine HAVE_MC               @HAVE_MC@ /* Set to true if enable_model-checking is true and the dependencies available */
 
 /* SMPI variables */
 #cmakedefine HAVE_SMPI          @HAVE_SMPI@
@@ -63,5 +63,5 @@
 #cmakedefine HAVE_VASPRINTF @HAVE_VASPRINTF@ /* Function vasprintf */
 
 /* Other checks */
-#cmakedefine ADDR2LINE       "@ADDR2LINE@"     /* Path to the addr2line tool */
-#cmakedefine HAVE_GRAPHVIZ   @HAVE_GRAPHVIZ@   /* The graphviz library */
+#cmakedefine ADDR2LINE       "@ADDR2LINE@" /* Path to the addr2line tool */
+#cmakedefine HAVE_GRAPHVIZ   @HAVE_GRAPHVIZ@ /* The graphviz library */

diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh
index ed65c7b..cd9b2b4 100755 (executable)
--- a/tools/jenkins/DynamicAnalysis.sh
+++ b/tools/jenkins/DynamicAnalysis.sh
@@ -22,7 +22,7 @@ do_cleanup() {
 
 for pkg in xsltproc valgrind gcovr
 do
-   if dpkg -l |grep -q $pkg 
+   if command -v $pkg
    then 
       echo "$pkg is installed. Good."
    else