X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=tests%2Fcheck_input_binary.c;h=cd2e777704f9e4062a9755dd22809fd36a1def95;hb=98de0c78743e27be185bce724fd847d20640ee22;hp=aad2b04e5f9ddcad6e9a59bfc5e4dbed04669d15;hpb=6592c3699509213395fa80af5b37f2e4db25ac38;p=libsigrok.git

diff --git a/tests/check_input_binary.c b/tests/check_input_binary.c
index aad2b04e..cd2e7777 100644
--- a/tests/check_input_binary.c
+++ b/tests/check_input_binary.c
@@ -30,8 +30,6 @@
 #define CHECK_ALL_HIGH		1
 #define CHECK_HELLO_WORLD	2
 
-static struct sr_context *sr_ctx;
-
 static uint64_t df_packet_counter = 0, sample_counter = 0;
 static gboolean have_seen_df_end = FALSE;
 static GArray *logic_channellist = NULL;
@@ -39,22 +37,6 @@ static int check_to_perform;
 static uint64_t expected_samples;
 static uint64_t *expected_samplerate;
 
-static void setup(void)
-{
-	int ret;
-
-	ret = sr_init(&sr_ctx);
-	fail_unless(ret == SR_OK, "sr_init() failed: %d.", ret);
-}
-
-static void teardown(void)
-{
-	int ret;
-
-	ret = sr_exit(sr_ctx);
-	fail_unless(ret == SR_OK, "sr_exit() failed: %d.", ret);
-}
-
 static void check_all_low(const struct sr_datafeed_logic *logic)
 {
 	uint64_t i;
@@ -204,6 +186,7 @@ static void check_buf(const char *filename, GHashTable *param,
 	int ret;
 	struct sr_input *in;
 	struct sr_input_format *in_format;
+	struct sr_session *session;
 
 	/* Initialize global variables for this run. */
 	df_packet_counter = sample_counter = 0;
@@ -226,11 +209,11 @@ static void check_buf(const char *filename, GHashTable *param,
 	ret = in->format->init(in, filename);
 	fail_unless(ret == SR_OK, "Input format init error: %d", ret);
 	
-	sr_session_new();
-	sr_session_datafeed_callback_add(datafeed_in, NULL);
-	sr_session_dev_add(in->sdi);
+	sr_session_new(&session);
+	sr_session_datafeed_callback_add(session, datafeed_in, NULL);
+	sr_session_dev_add(session, in->sdi);
 	in_format->loadfile(in, filename);
-	sr_session_destroy();
+	sr_session_destroy(session);
 
 	g_unlink(filename); /* Delete file again. */
 }
@@ -324,7 +307,7 @@ Suite *suite_input_binary(void)
 	s = suite_create("input-binary");
 
 	tc = tcase_create("basic");
-	tcase_add_checked_fixture(tc, setup, teardown);
+	tcase_add_checked_fixture(tc, srtest_setup, srtest_teardown);
 	tcase_add_test(tc, test_input_binary_all_low);
 	tcase_add_test(tc, test_input_binary_all_high);
 	tcase_add_loop_test(tc, test_input_binary_all_high_loop, 0, 10);