From 33dd61ba8feb01687a0faf745862f6ca3a92b8f8 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 30 Sep 2015 18:55:01 +0200
Subject: [PATCH] kill set-signal.tesh, catch-signal.tesh already test the same

---
 tools/cmake/AddTests.cmake   |  7 ++-----
 tools/tesh/CMakeLists.txt    |  1 -
 tools/tesh/catch-signal.tesh |  2 ++
 tools/tesh/set-signal.tesh   | 20 --------------------
 4 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 tools/tesh/set-signal.tesh

diff --git a/tools/cmake/AddTests.cmake b/tools/cmake/AddTests.cmake
index ef53354277..166aec8046 100644
--- a/tools/cmake/AddTests.cmake
+++ b/tools/cmake/AddTests.cmake
@@ -80,11 +80,8 @@ IF(NOT enable_memcheck)
   ADD_TESH(tesh-self-catch-wrong-output          --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/catch-wrong-output.tesh)
   ADD_TESH(tesh-self-bg-basic                    --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/bg-basic.tesh)
   ADD_TESH(tesh-self-background                  --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/background.tesh)
-  IF(NOT WIN32)
-    ADD_TESH(tesh-self-set-signal                --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/set-signal.tesh)
-    ADD_TESH(tesh-self-bg-set-signal             --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/bg-set-signal.tesh)
-    ADD_TESH(tesh-self-catch-signal              --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/catch-signal.tesh)
-  ENDIF()
+  ADD_TESH(tesh-self-bg-set-signal               --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/bg-set-signal.tesh)
+  ADD_TESH(tesh-self-catch-signal                --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/catch-signal.tesh)
 
   ### GENERIC  ###
   # BEGIN TESH TESTS
diff --git a/tools/tesh/CMakeLists.txt b/tools/tesh/CMakeLists.txt
index 69c5f7ae24..c45ae0b238 100644
--- a/tools/tesh/CMakeLists.txt
+++ b/tools/tesh/CMakeLists.txt
@@ -15,7 +15,6 @@ set(tesh_files
   ${CMAKE_CURRENT_SOURCE_DIR}/set-output-sort.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/set-output-sort-1.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/set-return.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/set-signal.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/set-timeout.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/background.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/basic.tesh
diff --git a/tools/tesh/catch-signal.tesh b/tools/tesh/catch-signal.tesh
index 3a7727f3e9..8229a7a377 100644
--- a/tools/tesh/catch-signal.tesh
+++ b/tools/tesh/catch-signal.tesh
@@ -9,9 +9,11 @@ $ cd temp_testdir-catch-signal
 < kill 'SEGV', $$;
 $ mkfile segfault.pl
 
+p Check that we notice when SEGV is raised
 ! expect signal SIGSEGV
 $ perl segfault.pl
 
+p Check that we return the expected return value on SEGV
 ! expect return 15
 < $ perl segfault.pl
 $ ../tesh --enable-coverage
diff --git a/tools/tesh/set-signal.tesh b/tools/tesh/set-signal.tesh
deleted file mode 100644
index 314b7f0fe8..0000000000
--- a/tools/tesh/set-signal.tesh
+++ /dev/null
@@ -1,20 +0,0 @@
-#! ./tesh
-# This suite builds and uses a program raising a segfault, ie a program dying
-# of SIGSEV. tesh must detect this condition and report the issue.
-
-$ rm -rf temp_testdir-set-signal
-$ mkdir temp_testdir-set-signal
-
-$ cd temp_testdir-set-signal
-< #include <stdlib.h>
-< int main(void) {
-<   char *A=NULL;
-<   *A = 1;
-< }
-$ mkfile segfault.c
-
-$ cc -o segfault segfault.c
-! expect signal SIGSEGV
-$ ./segfault
-$ cd ..
-$ rm -rf temp_testdir-set-signal
-- 
2.20.1