X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=tests%2Fcheck_decoder.c;h=d62a1ebad38f81936175d1eb66ba9c53e9a150fa;hb=97578cb1dfb0dcadf748b55dc4bcfa3ea2202c19;hp=8c60735d34557a01f9d89546855c6a2efcade6eb;hpb=a8c765481ed4eff56701724f11564a02c8660c03;p=libsigrokdecode.git

diff --git a/tests/check_decoder.c b/tests/check_decoder.c
index 8c60735..d62a1eb 100644
--- a/tests/check_decoder.c
+++ b/tests/check_decoder.c
@@ -40,7 +40,7 @@ START_TEST(test_load_all)
 {
 	int ret;
 
-	srd_init(NULL);
+	srd_init(DECODERS_DIR);
 	ret = srd_decoder_load_all();
 	fail_unless(ret == SRD_OK, "srd_decoder_load_all() failed: %d.", ret);
 	srd_exit();
@@ -69,7 +69,7 @@ START_TEST(test_load)
 {
 	int ret;
 
-	srd_init(NULL);
+	srd_init(DECODERS_DIR);
 	ret = srd_decoder_load("uart");
 	fail_unless(ret == SRD_OK, "srd_decoder_load(uart) failed: %d.", ret);
 	ret = srd_decoder_load("spi");
@@ -86,7 +86,7 @@ END_TEST
  */
 START_TEST(test_load_bogus)
 {
-	srd_init(NULL);
+	srd_init(DECODERS_DIR);
 	/* http://sigrok.org/bugzilla/show_bug.cgi?id=176 */
 	fail_unless(srd_decoder_load(NULL) != SRD_OK);
 	fail_unless(srd_decoder_load("") != SRD_OK);
@@ -109,7 +109,7 @@ END_TEST
  */
 START_TEST(test_load_valid_and_bogus)
 {
-	srd_init(NULL);
+	srd_init(DECODERS_DIR);
 	fail_unless(srd_decoder_load("") != SRD_OK);
 	fail_unless(srd_decoder_load("uart") == SRD_OK);
 	fail_unless(srd_decoder_load("") != SRD_OK);
@@ -130,8 +130,7 @@ START_TEST(test_load_multiple)
 {
 	int ret;
 
-	srd_init(NULL);
-	srd_log_loglevel_set(SRD_LOG_SPEW);
+	srd_init(DECODERS_DIR);
 	ret = srd_decoder_load("uart");
 	fail_unless(ret == SRD_OK, "Loading uart PD 1x failed: %d", ret);
 	ret = srd_decoder_load("uart");
@@ -164,7 +163,7 @@ END_TEST
  */
 START_TEST(test_decoder_list)
 {
-	srd_init(NULL);
+	srd_init(DECODERS_DIR);
 	srd_decoder_load_all();
 	fail_unless(srd_decoder_list() != NULL);
 	srd_exit();
@@ -178,7 +177,7 @@ END_TEST
  */
 START_TEST(test_decoder_list_no_load)
 {
-	srd_init(NULL);
+	srd_init(DECODERS_DIR);
 	fail_unless(srd_decoder_list() == NULL);
 	srd_exit();
 }
@@ -214,7 +213,7 @@ END_TEST
  */
 START_TEST(test_decoder_list_correct_numbers)
 {
-	srd_init(NULL);
+	srd_init(DECODERS_DIR);
 	fail_unless(g_slist_length((GSList *)srd_decoder_list()) == 0);
 	srd_decoder_load("spi");
 	fail_unless(g_slist_length((GSList *)srd_decoder_list()) == 1);
@@ -234,7 +233,7 @@ END_TEST
  */
 START_TEST(test_get_by_id)
 {
-	srd_init(NULL);
+	srd_init(DECODERS_DIR);
 	srd_decoder_load("uart");
 	fail_unless(srd_decoder_get_by_id("uart") != NULL);
 	fail_unless(srd_decoder_get_by_id("can") == NULL);
@@ -251,7 +250,7 @@ END_TEST
  */
 START_TEST(test_get_by_id_multiple)
 {
-	srd_init(NULL);
+	srd_init(DECODERS_DIR);
 	srd_decoder_load("uart");
 	fail_unless(srd_decoder_get_by_id("uart") != NULL);
 	fail_unless(srd_decoder_get_by_id("uart") != NULL);
@@ -267,7 +266,7 @@ END_TEST
  */
 START_TEST(test_get_by_id_bogus)
 {
-	srd_init(NULL);
+	srd_init(DECODERS_DIR);
 	fail_unless(srd_decoder_get_by_id(NULL) == NULL);
 	fail_unless(srd_decoder_get_by_id("") == NULL);
 	fail_unless(srd_decoder_get_by_id(" ") == NULL);
@@ -291,7 +290,7 @@ START_TEST(test_doc_get)
 {
 	struct srd_decoder *dec;
 
-	srd_init(NULL);
+	srd_init(DECODERS_DIR);
 	srd_decoder_load("uart");
 	dec = srd_decoder_get_by_id("uart");
 	fail_unless(srd_decoder_doc_get(dec) != NULL);
@@ -306,26 +305,8 @@ END_TEST
  */
 START_TEST(test_doc_get_null)
 {
-	srd_init(NULL);
-	fail_unless(srd_decoder_doc_get(NULL) != NULL);
-	srd_exit();
-}
-END_TEST
-
-/*
- * Check whether srd_decoder_doc_get() fails with an "empty" argument.
- * If it returns a value != NULL (or segfaults) this test will fail.
- * See also: http://sigrok.org/bugzilla/show_bug.cgi?id=180
- */
-START_TEST(test_doc_get_empty)
-{
-	struct srd_decoder dec;
-
-	srd_init(NULL);
-
-	memset(&dec, 0, sizeof(struct srd_decoder));
-	fail_unless(srd_decoder_doc_get(&dec) == NULL);
-
+	srd_init(DECODERS_DIR);
+	fail_unless(srd_decoder_doc_get(NULL) == NULL);
 	srd_exit();
 }
 END_TEST
@@ -366,7 +347,6 @@ Suite *suite_decoder(void)
 	tc = tcase_create("doc_get");
 	tcase_add_test(tc, test_doc_get);
 	tcase_add_test(tc, test_doc_get_null);
-	tcase_add_test(tc, test_doc_get_empty);
 	suite_add_tcase(s, tc);
 
 	return s;