BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: Factor out srtest_setup() and srtest_teardown().

This commit is contained in:
Uwe Hermann 2014-08-11 13:20:50 +02:00
parent 41de54ffb1
commit 98de0c7874
6 changed files with 28 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/check_driver_all.c
View File

@ -23,24 +23,6 @@
#include "../include/libsigrok/libsigrok.h"
#include "lib.h"
struct sr_context *sr_ctx;
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);
}
/* Check whether at least one driver is available. */
START_TEST(test_driver_available)
{
@ -54,7 +36,7 @@ END_TEST
/* Check whether initializing all drivers works. */
START_TEST(test_driver_init_all)
{
srtest_driver_init_all(sr_ctx);
srtest_driver_init_all(srtest_ctx);
}
END_TEST
@ -85,7 +67,7 @@ Suite *suite_driver_all(void)
s = suite_create("driver-all");
tc = tcase_create("config");
tcase_add_checked_fixture(tc, setup, teardown);
tcase_add_checked_fixture(tc, srtest_setup, srtest_teardown);
tcase_add_test(tc, test_driver_available);
tcase_add_test(tc, test_driver_init_all);
// TODO: Currently broken.

20
tests/check_input_binary.c
View File

@ -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;
@ -325,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);

20
tests/check_session.c
View File

@ -23,24 +23,6 @@
#include "../include/libsigrok/libsigrok.h"
#include "lib.h"
static struct sr_context *sr_ctx;
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);
}
/*
* Check whether sr_session_new() works.
* If it returns != SR_OK (or segfaults) this test will fail.
@ -144,7 +126,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, srtest_setup, srtest_teardown);
tcase_add_test(tc, test_session_new);
tcase_add_test(tc, test_session_new_bogus);
tcase_add_test(tc, test_session_new_multiple);

20
tests/check_strutil.c
View File

@ -22,24 +22,6 @@
#include "../include/libsigrok/libsigrok.h"
#include "lib.h"
struct sr_context *sr_ctx;
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 test_samplerate(uint64_t samplerate, const char *expected)
{
char *s;
@ -180,7 +162,7 @@ Suite *suite_strutil(void)
s = suite_create("strutil");
tc = tcase_create("sr_samplerate_string");
tcase_add_checked_fixture(tc, setup, teardown);
tcase_add_checked_fixture(tc, srtest_setup, srtest_teardown);
tcase_add_test(tc, test_hz);
tcase_add_test(tc, test_khz);
tcase_add_test(tc, test_mhz);

18
tests/lib.c
View File

@ -26,6 +26,24 @@
#include "../include/libsigrok/libsigrok.h"
#include "lib.h"
struct sr_context *srtest_ctx;
void srtest_setup(void)
{
int ret;
ret = sr_init(&srtest_ctx);
fail_unless(ret == SR_OK, "sr_init() failed: %d.", ret);
}
void srtest_teardown(void)
{
int ret;
ret = sr_exit(srtest_ctx);
fail_unless(ret == SR_OK, "sr_exit() failed: %d.", ret);
}
/* Get a libsigrok driver by name. */
struct sr_dev_driver *srtest_driver_get(const char *drivername)
{

5
tests/lib.h
View File

@ -23,6 +23,11 @@
#include "../include/libsigrok/libsigrok.h"
extern struct sr_context *srtest_ctx;
void srtest_setup(void);
void srtest_teardown(void);
struct sr_dev_driver *srtest_driver_get(const char *drivername);
struct sr_input_format *srtest_input_get(const char *id);