From 4a0cd62562c7524c44f6d134e4c7eefff4a5ced7 Mon Sep 17 00:00:00 2001
From: Augustin Degomme <adegomme@users.noreply.github.com>
Date: Fri, 19 Feb 2021 09:46:53 +0100
Subject: [PATCH] activate leak-check output on mpich3-test. Disable
 specifically on scancel test, because refcounts are incoherent in this case.

---
 teshsuite/smpi/mpich3-test/pt2pt/scancel.c | 2 ++
 teshsuite/smpi/mpich3-test/runtests        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/teshsuite/smpi/mpich3-test/pt2pt/scancel.c b/teshsuite/smpi/mpich3-test/pt2pt/scancel.c
index 41ff23228b..0c3e3aa525 100644
--- a/teshsuite/smpi/mpich3-test/pt2pt/scancel.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/scancel.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "mpitest.h"
+#include "xbt/log.h"
 
 /*
 static char MTEST_Descrip[] = "Test of various send cancel calls";
@@ -28,6 +29,7 @@ int main(int argc, char *argv[])
     int cs, flag, n;
 
     MTest_Init(&argc, &argv);
+    xbt_log_control_set("smpi_kernel.thr:critical");
 
     comm = MPI_COMM_WORLD;
     MPI_Comm_rank(comm, &rank);
diff --git a/teshsuite/smpi/mpich3-test/runtests b/teshsuite/smpi/mpich3-test/runtests
index 4d458482f7..bd2c8e4d2e 100755
--- a/teshsuite/smpi/mpich3-test/runtests
+++ b/teshsuite/smpi/mpich3-test/runtests
@@ -161,7 +161,7 @@ foreach $_ (@ARGV) {
     elsif (/--?platformfile=(.*)/) { $platformfile = $1; }
     elsif (/--?hostfile=(.*)/) { $hostfile = $1; }
     elsif (/--?srcdir=(.*)/) { $srcdir = $1;
-	$mpiexec="$mpiexec  -platform ${srcdir}/$platformfile -hostfile ${srcdir}/$hostfile --log=root.thr:critical --cfg=smpi/host-speed:1e9  --cfg=smpi/async-small-thresh:65536"; }
+	$mpiexec="$mpiexec  -platform ${srcdir}/$platformfile -hostfile ${srcdir}/$hostfile --log=root.thr:critical --log=smpi_kernel.thr:warning --cfg=smpi/host-speed:1e9f  --cfg=smpi/async-small-thresh:65536"; }
     elsif (/--?verbose/) { $verbose = 1; }
     elsif (/--?showprogress/) { $showProgress = 1; }
     elsif (/--?debug/) { $debug = 1; }
-- 
2.20.1