Updated tests for timeout message change

git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@224 64e312b2-a51f-0410-8e61-82d0ca0eb02a

diff --git a/check/tests/check_check_master.c b/check/tests/check_check_master.c
index 71682df74ee82f4b89a449bd7ad82ebc6e2ec040..d4d635534b4c012a7ef72d0b24a85c5203af1abd 100644 (file)
--- a/check/tests/check_check_master.c
+++ b/check/tests/check_check_master.c
@@ -35,23 +35,24 @@ static master_test_t master_tests[] = {
   { "Simple Tests",  -1, CK_FAILURE, "Failed" },
   { "Signal Tests",  -1, CK_ERROR,   "Received signal 11 (Segmentation fault)" },
   { "Signal Tests",  -1, CK_PASS,    "Passed" },
-  { "Signal Tests", 104, CK_ERROR,   "Error: Received signal 11 (Segmentation fault), expected 8 (Floating point exception)" },
+  { "Signal Tests", 104, CK_ERROR,   "Received signal 11 (Segmentation fault), expected 8 (Floating point exception)" },
   { "Signal Tests",  -1, CK_FAILURE, "Early exit with return value 0" },
   { "Signal Tests",  -1, CK_FAILURE, "Early exit with return value 1" },
   { "Signal Tests",  -1, CK_ERROR,   "Received signal 8 (Floating point exception)" },
   { "Signal Tests",  -1, CK_ERROR,   "Received signal 8 (Floating point exception)" },
-  { "Timeout Tests", 132, CK_ERROR,  "Received signal 9 (Killed)" },
+  { "Timeout Tests", 132, CK_ERROR,  "Test timeout expired" },
   { "Timeout Tests",  -1, CK_PASS,   "Passed" },
-  { "Timeout Tests", 145, CK_ERROR,  "Received signal 9 (Killed)" },
-  { "Timeout Tests", 151, CK_ERROR,  "Received signal 9 (Killed)" },
-  { "Extended Timeout Tests", 132, CK_ERROR,  "Received signal 9 (Killed)" },
+  { "Timeout Tests", 145, CK_ERROR,  "Test timeout expired" },
+  { "Timeout Tests", 151, CK_ERROR,  "Test timeout expired" },
+  { "Extended Timeout Tests", 132, CK_ERROR,  "Test timeout expired" },
   { "Extended Timeout Tests",  -1, CK_PASS,   "Passed" },
   { "Extended Timeout Tests",  -1, CK_PASS,   "Passed" },
-  { "Extended Timeout Tests", 151, CK_ERROR,  "Received signal 9 (Killed)" },
-  { "Timeout Tests", 132, CK_ERROR,  "Received signal 9 (Killed)" },
+  { "Extended Timeout Tests", 151, CK_ERROR,  "Test timeout expired" },
+  /* Timeout tests are run twice , see check_check_sub.c:make_sub_suite() */
+  { "Timeout Tests", 132, CK_ERROR,  "Test timeout expired" },
   { "Timeout Tests",  -1, CK_PASS,   "Passed" },
-  { "Timeout Tests", 145, CK_ERROR,  "Received signal 9 (Killed)" },
-  { "Timeout Tests", 151, CK_ERROR,  "Received signal 9 (Killed)" },
+  { "Timeout Tests", 145, CK_ERROR,  "Test timeout expired" },
+  { "Timeout Tests", 151, CK_ERROR,  "Test timeout expired" },
   { "Limit Tests",   -1, CK_ERROR,   "Early exit with return value 1" },
   { "Limit Tests",   -1, CK_FAILURE, "Completed properly" },
   { "Limit Tests",   -1, CK_FAILURE, "Completed properly" },