unit tests: Disable timeout for one of the test cases.

[libsigrokdecode.git] / tests / check_session.c

diff --git a/tests/check_session.c b/tests/check_session.c
index f411854626a0a4c83e7d5586e186891d0bf5f538..d6895af8f4ec174ee19c785f3ac0f2876f263741 100644 (file)
--- a/tests/check_session.c
+++ b/tests/check_session.c
@@ -18,23 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "../libsigrokdecode.h" /* First, to avoid compiler warning. */
-#include "../libsigrokdecode-internal.h"
+#include "../libsigrokdecode-internal.h" /* First, to avoid compiler warning. */
+#include "../libsigrokdecode.h"
 #include <stdint.h>
 #include <stdlib.h>
 #include <check.h>
 #include "lib.h"
 
-static void setup(void)
-{
-       /* Silence libsigrokdecode while the unit tests run. */
-       srd_log_loglevel_set(SRD_LOG_NONE);
-}
-
-static void teardown(void)
-{
-}
-
 /*
  * Check whether srd_session_new() works.
  * If it returns != SRD_OK (or segfaults) this test will fail.
@@ -242,7 +232,7 @@ Suite *suite_session(void)
        s = suite_create("session");
 
        tc = tcase_create("new_destroy");
-       tcase_add_checked_fixture(tc, setup, teardown);
+       tcase_add_checked_fixture(tc, srdtest_setup, srdtest_teardown);
        tcase_add_test(tc, test_session_new);
        tcase_add_test(tc, test_session_new_bogus);
        tcase_add_test(tc, test_session_new_multiple);
@@ -251,7 +241,7 @@ Suite *suite_session(void)
        suite_add_tcase(s, tc);
 
        tc = tcase_create("config");
-       tcase_add_checked_fixture(tc, setup, teardown);
+       tcase_add_checked_fixture(tc, srdtest_setup, srdtest_teardown);
        tcase_add_test(tc, test_session_metadata_set);
        tcase_add_test(tc, test_session_metadata_set_bogus);
        suite_add_tcase(s, tc);