X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=tests%2Fdecoder.c;h=3a86566666b212b666eee044cd7c519cadb2bc70;hb=943f9176255c63924fcf55c6ba8bad05e91d4923;hp=726e17c5a58e63a40ccc87d0dd04986d8a62bd4a;hpb=c052046717c09758bbdf62819e0029dddcae7159;p=libsigrokdecode.git

diff --git a/tests/decoder.c b/tests/decoder.c
index 726e17c..3a86566 100644
--- a/tests/decoder.c
+++ b/tests/decoder.c
@@ -18,7 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "../libsigrokdecode.h" /* First, to avoid compiler warning. */
+#include <config.h>
+#include <libsigrokdecode.h> /* First, to avoid compiler warning. */
 #include <stdlib.h>
 #include <check.h>
 #include "lib.h"
@@ -31,7 +32,7 @@ START_TEST(test_load_all)
 {
 	int ret;
 
-	srd_init(DECODERS_DIR);
+	srd_init(DECODERS_TESTDIR);
 	ret = srd_decoder_load_all();
 	fail_unless(ret == SRD_OK, "srd_decoder_load_all() failed: %d.", ret);
 	srd_exit();
@@ -60,7 +61,7 @@ START_TEST(test_load)
 {
 	int ret;
 
-	srd_init(DECODERS_DIR);
+	srd_init(DECODERS_TESTDIR);
 	ret = srd_decoder_load("uart");
 	fail_unless(ret == SRD_OK, "srd_decoder_load(uart) failed: %d.", ret);
 	ret = srd_decoder_load("spi");
@@ -77,7 +78,7 @@ END_TEST
  */
 START_TEST(test_load_bogus)
 {
-	srd_init(DECODERS_DIR);
+	srd_init(DECODERS_TESTDIR);
 	/* http://sigrok.org/bugzilla/show_bug.cgi?id=176 */
 	fail_unless(srd_decoder_load(NULL) != SRD_OK);
 	fail_unless(srd_decoder_load("") != SRD_OK);
@@ -100,7 +101,7 @@ END_TEST
  */
 START_TEST(test_load_valid_and_bogus)
 {
-	srd_init(DECODERS_DIR);
+	srd_init(DECODERS_TESTDIR);
 	fail_unless(srd_decoder_load("") != SRD_OK);
 	fail_unless(srd_decoder_load("uart") == SRD_OK);
 	fail_unless(srd_decoder_load("") != SRD_OK);
@@ -121,7 +122,7 @@ START_TEST(test_load_multiple)
 {
 	int ret;
 
-	srd_init(DECODERS_DIR);
+	srd_init(DECODERS_TESTDIR);
 	ret = srd_decoder_load("uart");
 	fail_unless(ret == SRD_OK, "Loading uart PD 1x failed: %d", ret);
 	ret = srd_decoder_load("uart");
@@ -154,7 +155,7 @@ END_TEST
  */
 START_TEST(test_decoder_list)
 {
-	srd_init(DECODERS_DIR);
+	srd_init(DECODERS_TESTDIR);
 	srd_decoder_load_all();
 	fail_unless(srd_decoder_list() != NULL);
 	srd_exit();
@@ -168,7 +169,7 @@ END_TEST
  */
 START_TEST(test_decoder_list_no_load)
 {
-	srd_init(DECODERS_DIR);
+	srd_init(DECODERS_TESTDIR);
 	fail_unless(srd_decoder_list() == NULL);
 	srd_exit();
 }
@@ -204,7 +205,7 @@ END_TEST
  */
 START_TEST(test_decoder_list_correct_numbers)
 {
-	srd_init(DECODERS_DIR);
+	srd_init(DECODERS_TESTDIR);
 	fail_unless(g_slist_length((GSList *)srd_decoder_list()) == 0);
 	srd_decoder_load("spi");
 	fail_unless(g_slist_length((GSList *)srd_decoder_list()) == 1);
@@ -224,7 +225,7 @@ END_TEST
  */
 START_TEST(test_get_by_id)
 {
-	srd_init(DECODERS_DIR);
+	srd_init(DECODERS_TESTDIR);
 	srd_decoder_load("uart");
 	fail_unless(srd_decoder_get_by_id("uart") != NULL);
 	fail_unless(srd_decoder_get_by_id("can") == NULL);
@@ -241,7 +242,7 @@ END_TEST
  */
 START_TEST(test_get_by_id_multiple)
 {
-	srd_init(DECODERS_DIR);
+	srd_init(DECODERS_TESTDIR);
 	srd_decoder_load("uart");
 	fail_unless(srd_decoder_get_by_id("uart") != NULL);
 	fail_unless(srd_decoder_get_by_id("uart") != NULL);
@@ -257,7 +258,7 @@ END_TEST
  */
 START_TEST(test_get_by_id_bogus)
 {
-	srd_init(DECODERS_DIR);
+	srd_init(DECODERS_TESTDIR);
 	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);
@@ -281,7 +282,7 @@ START_TEST(test_doc_get)
 {
 	struct srd_decoder *dec;
 
-	srd_init(DECODERS_DIR);
+	srd_init(DECODERS_TESTDIR);
 	srd_decoder_load("uart");
 	dec = srd_decoder_get_by_id("uart");
 	fail_unless(srd_decoder_doc_get(dec) != NULL);
@@ -296,7 +297,7 @@ END_TEST
  */
 START_TEST(test_doc_get_null)
 {
-	srd_init(DECODERS_DIR);
+	srd_init(DECODERS_TESTDIR);
 	fail_unless(srd_decoder_doc_get(NULL) == NULL);
 	srd_exit();
 }