Changeset b79308b for tests/check.c

Timestamp:

2008-04-14T13:10:53Z (17 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

0cab388

Parents:

6cac643 (diff), aa31117 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merged in upstream r379 (somewhere after 1.2-3).
Just one trivial conflict in the jabber Makefile, went smoothly.

File:

• tests/check.c (modified) (2 diffs)

tests/check.c

@@ -66 +66 @@
 Suite *set_suite(void);
 
+/* From check_jabber_sasl.c */
+Suite *jabber_sasl_suite(void);
+
 int main (int argc, char **argv)
 {
@@ -111 +114 @@
         srunner_add_suite(sr, crypting_suite());
         srunner_add_suite(sr, set_suite());
+        srunner_add_suite(sr, jabber_sasl_suite());
         if (no_fork)
                 srunner_set_fork_status(sr, CK_NOFORK);