From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Thu, 8 Sep 2016 10:10:14 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_14~415
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c6de5d3fc33ec47c1b0d97e24463de43dd4eb129?hp=3ebb95127bac9bc6d8ba66319f1db561e9a5c6c1

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

diff --git a/teshsuite/simdag/basic-link-test/basic-link-test.c b/teshsuite/simdag/basic-link-test/basic-link-test.c
index b7a67e05c6..36971c3fe7 100644
--- a/teshsuite/simdag/basic-link-test/basic-link-test.c
+++ b/teshsuite/simdag/basic-link-test/basic-link-test.c
@@ -22,7 +22,7 @@ int main(int argc, char **argv)
 
   /* creation of the environment */
   SD_create_environment(argv[1]);
-  const SD_link_t *links = sg_link_list();
+  SD_link_t *links = sg_link_list();
   int count = sg_link_count();
   XBT_INFO("Link count: %d", count);
   qsort((void *)links, count, sizeof(SD_link_t), cmp_link);
@@ -33,7 +33,7 @@ int main(int argc, char **argv)
     sg_link_data_set(links[i], (void*) user_data);
     xbt_assert(!strcmp(user_data, (const char*)sg_link_data(links[i])),"User data was corrupted.");
   }
-
+  xbt_free(links);
   SD_exit();
   return 0;
 }
diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py
index 0beb5af2c5..8c62946e4a 100755
--- a/tools/tesh/tesh.py
+++ b/tools/tesh/tesh.py
@@ -399,7 +399,7 @@ if __name__ == '__main__':
         print("Ignore all cruft seen on SimGrid's continous integration servers")
         TeshState().ignore_regexps_common = [
            re.compile("^profiling:"),
-           re.compile("WARNING: ASan doesn't fully support"),
+           re.compile(".*WARNING: ASan doesn\'t fully support"),
            re.compile("Unable to clean temporary file C:")]
     
     if options.teshfile is None: