From 125459230d4705e5ee569c14d469d83b3ed76a2c Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Wed, 8 Nov 2017 21:40:39 +0100
Subject: [PATCH] Fix compilation warnings in ISP testsuite (mostly unused
 variables).

---
 teshsuite/smpi/isp/umpire/CMakeLists.txt         | 2 +-
 teshsuite/smpi/isp/umpire/change-send-buffer.c   | 1 -
 teshsuite/smpi/isp/umpire/comm-translate-ranks.c | 1 -
 teshsuite/smpi/isp/umpire/irecv-deadlock.c       | 1 -
 teshsuite/smpi/isp/umpire/lost-request-waitall.c | 6 +++---
 teshsuite/smpi/isp/umpire/no-error-testany.c     | 2 +-
 teshsuite/smpi/isp/umpire/wait-deadlock.c        | 1 -
 7 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/teshsuite/smpi/isp/umpire/CMakeLists.txt b/teshsuite/smpi/isp/umpire/CMakeLists.txt
index fcf19e452b..cc7f9c7ae9 100644
--- a/teshsuite/smpi/isp/umpire/CMakeLists.txt
+++ b/teshsuite/smpi/isp/umpire/CMakeLists.txt
@@ -208,7 +208,7 @@ if(enable_smpi AND enable_model-checking AND enable_smpi_ISP_testsuite)
   foreach (test ${umpire_tests_passing} ${umpire_tests_deadlock} ${umpire_tests_problematic} )
     add_executable(${test} ${test}.c)
     target_link_libraries(${test} simgrid)
-    set_source_files_properties(${test}.c PROPERTIES COMPILE_FLAGS "-Wno-error -Wno-return-type")
+    set_source_files_properties(${test}.c PROPERTIES COMPILE_FLAGS "-Dlint -Wno-error -Wno-return-type")
     set(umpire_tesh ${umpire_tesh} ${test})
     set(files_to_clean ${files_to_clean} ${CMAKE_CURRENT_BINARY_DIR}/${test}.tesh)
   endforeach(test)
diff --git a/teshsuite/smpi/isp/umpire/change-send-buffer.c b/teshsuite/smpi/isp/umpire/change-send-buffer.c
index 4d21ed5c24..e3c9d3ea3f 100644
--- a/teshsuite/smpi/isp/umpire/change-send-buffer.c
+++ b/teshsuite/smpi/isp/umpire/change-send-buffer.c
@@ -34,7 +34,6 @@ main (int argc, char **argv)
   MPI_Get_processor_name (processor_name, &namelen);
   printf ("(%d) is alive on %s\n", rank, processor_name);
   fflush (stdout);
-int j, k;
   for (i = 0; i < 128; i++)
     {
       buf0[i] = i;
diff --git a/teshsuite/smpi/isp/umpire/comm-translate-ranks.c b/teshsuite/smpi/isp/umpire/comm-translate-ranks.c
index c6e54cada2..7acfc0156c 100644
--- a/teshsuite/smpi/isp/umpire/comm-translate-ranks.c
+++ b/teshsuite/smpi/isp/umpire/comm-translate-ranks.c
@@ -24,7 +24,6 @@ main (int argc, char **argv)
   int key = -1;
   int nrank;
   int nsize;
-  int dat = 0;
   int color = -1;
 
 
diff --git a/teshsuite/smpi/isp/umpire/irecv-deadlock.c b/teshsuite/smpi/isp/umpire/irecv-deadlock.c
index c1a16fe059..a4ab3d0a22 100644
--- a/teshsuite/smpi/isp/umpire/irecv-deadlock.c
+++ b/teshsuite/smpi/isp/umpire/irecv-deadlock.c
@@ -15,7 +15,6 @@ main (int argc, char **argv)
   char processor_name[128];
   int namelen = 128;
   int buf0[buf_size];
-  int buf1[buf_size];
   MPI_Status status;
   MPI_Request req;
 
diff --git a/teshsuite/smpi/isp/umpire/lost-request-waitall.c b/teshsuite/smpi/isp/umpire/lost-request-waitall.c
index 4a6051bafa..9eee182988 100644
--- a/teshsuite/smpi/isp/umpire/lost-request-waitall.c
+++ b/teshsuite/smpi/isp/umpire/lost-request-waitall.c
@@ -14,7 +14,7 @@ static char *rcsid =
 
 #define buf_size 128
 
-int mydelay ()			/* about 6 seconds */
+static int mydelay(void) /* about 6 seconds */
 {
   int i;
   int val;
@@ -37,8 +37,8 @@ main (int argc, char **argv)
   int namelen = 128;
   int buf0[buf_size];
   int buf1[buf_size];
-  MPI_Request req, req0, req1;
-  MPI_Status status, status0, status1;
+  MPI_Request req;
+  MPI_Status status;
   MPI_Request areq[10];
   MPI_Status astatus[10];
 
diff --git a/teshsuite/smpi/isp/umpire/no-error-testany.c b/teshsuite/smpi/isp/umpire/no-error-testany.c
index 75bdb656ed..f7924fdc41 100644
--- a/teshsuite/smpi/isp/umpire/no-error-testany.c
+++ b/teshsuite/smpi/isp/umpire/no-error-testany.c
@@ -47,7 +47,7 @@ main (int argc, char **argv)
 	MPI_Send (&flipbit, 1, MPI_INT, 1, i, MPI_COMM_WORLD);
 
 	flag = 0;
-printf ("req = %0x", (unsigned int)reqs);
+	printf("req = %p", reqs);
 	while (!flag)
 	    MPI_Testany (i, reqs, &done, &flag, &status);
 
diff --git a/teshsuite/smpi/isp/umpire/wait-deadlock.c b/teshsuite/smpi/isp/umpire/wait-deadlock.c
index 67acdc0433..e528524b18 100644
--- a/teshsuite/smpi/isp/umpire/wait-deadlock.c
+++ b/teshsuite/smpi/isp/umpire/wait-deadlock.c
@@ -26,7 +26,6 @@ main (int argc, char **argv)
   MPI_Get_processor_name (processor_name, &namelen);
   printf ("(%d) is alive on %s\n", rank, processor_name);
   fflush (stdout);
-	int i;
   MPI_Barrier (MPI_COMM_WORLD);
 
   if (nprocs < 2)
-- 
2.20.1