From: Bert Vermeulen <redacted>
Date: Wed, 11 Dec 2013 11:50:38 +0000 (+0100)
Subject: runtc: Make sure to test this set of decoders, not the installed ones.
X-Git-Tag: libsigrokdecode-0.3.0~200
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff_plain;h=b74823812d4106bfafc4a7fef1d4a141dac58519

runtc: Make sure to test this set of decoders, not the installed ones.
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7841f05..5739a03 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -41,6 +41,7 @@ endif
 if HAVE_LIBSIGROK
 bin_PROGRAMS = runtc
 runtc_SOURCES = runtc.c
-runtc_CPPFLAGS = $(CPPFLAGS_PYTHON) $(LIBSIGROK_CFLAGS)
+runtc_CPPFLAGS = $(CPPFLAGS_PYTHON) $(LIBSIGROK_CFLAGS) \
+	-DDECODERS_DIR='"$(abs_top_builddir)/decoders"'
 runtc_LDFLAGS = $(LIBSIGROK_LIBS) -L$(top_builddir) -lsigrokdecode
 endif
diff --git a/tests/runtc.c b/tests/runtc.c
index 78dbf5e..bb25950 100644
--- a/tests/runtc.c
+++ b/tests/runtc.c
@@ -468,7 +468,7 @@ int main(int argc, char **argv)
 		return 1;
 
 	srd_log_callback_set(srd_log, NULL);
-	if (srd_init(NULL) != SRD_OK)
+	if (srd_init(DECODERS_DIR) != SRD_OK)
 		return 1;
 
 	run_testcase(opt_infile, pdlist, op);