X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=tests%2Fcheck_decoder.c;h=527845f9ae4e9406693041174554349ee38cec5f;hp=e84658517ca42347d99a0c758b5720ad4f44ea6c;hb=83df730dd21ce52670a593455cfe5e732989a90d;hpb=eaad935fbaa3c301aded9c64dfe514cc4ca40968

diff --git a/tests/check_decoder.c b/tests/check_decoder.c
index e846585..527845f 100644
--- a/tests/check_decoder.c
+++ b/tests/check_decoder.c
@@ -21,6 +21,7 @@
 #include "../libsigrokdecode.h" /* First, to avoid compiler warning. */
 #include <stdlib.h>
 #include <check.h>
+#include "lib.h"
 
 static void setup(void)
 {
@@ -40,7 +41,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 +70,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 +87,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 +110,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 +131,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 +164,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 +178,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 +214,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 +234,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 +251,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 +267,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 +291,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,7 +306,7 @@ END_TEST
  */
 START_TEST(test_doc_get_null)
 {
-	srd_init(NULL);
+	srd_init(DECODERS_DIR);
 	fail_unless(srd_decoder_doc_get(NULL) == NULL);
 	srd_exit();
 }