Completed testing for multiple suite running, and reorganized files

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

diff --git a/check/src/Makefile.in b/check/src/Makefile.in
index 80ef9a99aeb13ed80768bb043a0b25e69a820aaf..122b877c0b4a000faea05a2efd16b41b3720a317 100644 (file)
--- a/check/src/Makefile.in
+++ b/check/src/Makefile.in
@@ -69,9 +69,9 @@ have_sgmltools = @have_sgmltools@
 
 lib_LIBRARIES = libcheck.a
 
-include_HEADERS = check.h check_log.h
+include_HEADERS = check.h
 
-libcheck_a_SOURCES =   check.c check_run.c check.h check_impl.h        check_msg.c check_msg.h         check_log.c check_log.h         error.c error.h         list.c list.h
+libcheck_a_SOURCES =   check.c check_run.c check.h check_impl.h        check_msg.c check_msg.h         check_log.c     error.c error.h         list.c list.h
 
 
 CLEANFILES = *.*~

diff --git a/check/src/check_log.c b/check/src/check_log.c
index 8d2bfb3baab9c2022eca01f8a05b9b45720f6803..bc96f95659755e4a65ff1d6a1ec0dedd3d9fb98f 100644 (file)
--- a/check/src/check_log.c
+++ b/check/src/check_log.c
@@ -1,7 +1,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <check.h>
-#include <check_log.h>
 #include "list.h"
 #include "check_impl.h"
 

diff --git a/check/tests/check_check.h b/check/tests/check_check.h
index dafc0867a6cee152a601a832c7c77bfaecf3a229..f053bc13f2c01c66417739ce359b557a532ba8c4 100644 (file)
--- a/check/tests/check_check.h
+++ b/check/tests/check_check.h
@@ -7,6 +7,7 @@ int sub_ntests;
 void setup (void);
 void cleanup (void);
 Suite *make_sub_suite(void);
+Suite *make_sub2_suite(void);
 Suite *make_master_suite(void);
 Suite *make_list_suite(void);
 Suite *make_msg_suite(void);

diff --git a/check/tests/check_check_log.c b/check/tests/check_check_log.c
index 92e3234a98b8d13a1475b7f894ac6f69156e66a8..cf6575540ab62ac73de65a355939537e7babb0fc 100644 (file)
--- a/check/tests/check_check_log.c
+++ b/check/tests/check_check_log.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <check.h>
-#include <check_log.h>
 
 
 START_TEST(test_set_log)

diff --git a/check/tests/check_check_master.c b/check/tests/check_check_master.c
index 1c3bd20ffe24594fbef0f0e74dd559709a16741e..e91a2d5f1e4220c04cab5a416f520a11a7cdca2a 100644 (file)
--- a/check/tests/check_check_master.c
+++ b/check/tests/check_check_master.c
@@ -8,13 +8,13 @@ TestResult **tr_all_array;
 
 START_TEST(test_check_nfailures)
 {
-  fail_unless (sub_nfailed == 8, "Unexpected number of failures received");
+  fail_unless (sub_nfailed == 9, "Unexpected number of failures received");
 }
 END_TEST
 
 START_TEST(test_check_ntests_run)
 {
-  fail_unless (sub_ntests == 9, "Unexpected number of tests run");
+  fail_unless (sub_ntests == 10, "Unexpected number of tests run");
 }
 END_TEST
 
@@ -30,7 +30,8 @@ START_TEST(test_check_failure_msgs)
     "Received signal 8",
     "Received signal 8",
     "Early exit with return value 1",
-    "Completed properly"};
+    "Completed properly",
+    "We failed"};
 
   for (i = 0; i < sub_nfailed; i++) {
     char *msg;   
@@ -84,6 +85,7 @@ START_TEST(test_check_failure_ftypes)
     CRERROR,
     CRERROR,
     CRERROR,
+    CRFAILURE,
     CRFAILURE};
   
   for (i = 0; i < sub_nfailed; i++) {
@@ -128,7 +130,8 @@ START_TEST(test_check_all_msgs)
     "Received signal 8",
     "Received signal 8",
     "Early exit with return value 1",
-    "Completed properly"};
+    "Completed properly",
+    "We failed"};
 
   for (i = 0; i < sub_ntests; i++) {
     char *msg;   
@@ -155,6 +158,7 @@ START_TEST(test_check_all_ftypes)
     CRERROR,
     CRERROR,
     CRERROR,
+    CRFAILURE,
     CRFAILURE};
   
   for (i = 0; i < sub_ntests; i++) {
@@ -228,6 +232,7 @@ void setup (void)
   char *msg;
   Suite *s = make_sub_suite();
   SRunner *sr = srunner_create(s);
+  srunner_add_suite(sr, make_sub2_suite());
   srunner_run_all(sr, CRSILENT);
   tr_fail_array = srunner_failures(sr);
   tr_all_array = srunner_results(sr);

diff --git a/check/tests/check_check_sub.c b/check/tests/check_check_sub.c
index 7ae2ebdd170b1e2b2e8d0083e4fb2a9a81780453..72f583487b5ce16f9f8e3dd27d85606cc84367b6 100644 (file)
--- a/check/tests/check_check_sub.c
+++ b/check/tests/check_check_sub.c
@@ -87,6 +87,22 @@ START_TEST(test_null)
 }
 END_TEST
 
+START_TEST(test_2nd_suite)
+{
+  fail("We failed");
+}
+END_TEST
+
+Suite *make_sub2_suite(void)
+{
+  Suite *s = suite_create("Check Servant2");
+  TCase *tc = tcase_create("Core");
+  suite_add_tcase(s, tc);
+  tcase_add_test(tc, test_2nd_suite);
+
+  return s;
+}
+
 Suite *make_sub_suite(void)
 {
   Suite *s = suite_create("Check Servant");

diff --git a/check/tests/test_output.sh b/check/tests/test_output.sh
index 5464990b7c0cec7dc008ac496b4afd15727bde05..a3291d57839273a16cc89c47fda475dc762c867a 100755 (executable)
--- a/check/tests/test_output.sh
+++ b/check/tests/test_output.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 
 t0="x"
-t1="xRunning suite: Master
+t1="xRunning suite(s): Master
 33%: Checks: 3, Failures: 1, Errors: 1"
-t2="xRunning suite: Master
+t2="xRunning suite(s): Master
 33%: Checks: 3, Failures: 1, Errors: 1
 ex_output.c:13:F:Core: Failure
 ex_output.c:17:E:Core: (after this point) Early exit with return value 1"
-t3="xRunning suite: Master
+t3="xRunning suite(s): Master
 33%: Checks: 3, Failures: 1, Errors: 1
 ex_output.c:7:P:Core: Test passed
 ex_output.c:13:F:Core: Failure