Remove dependency on Python.h from public API header

[libsigrokdecode.git] / tests / runtc.c

diff --git a/tests/runtc.c b/tests/runtc.c
index cd3d44983fe0598d9d609ea4e8dea5683c9c125a..096ff1609e638c85b4952302e19b3b721a5dc7eb 100644 (file)
--- a/tests/runtc.c
+++ b/tests/runtc.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <Python.h>
 #include "../libsigrokdecode.h"
 #include <libsigrok/libsigrok.h>
 #include <stdlib.h>
@@ -35,7 +36,7 @@
 #ifdef __LINUX__
 #include <sched.h>
 #endif
-#include "../config.h"
+#include "config.h"
 
 int debug = FALSE;
 int statistics = FALSE;
@@ -48,7 +49,7 @@ struct channel {
 
 struct option {
        char *key;
-       char *value;
+       GVariant *value;
 };
 
 struct pd {
@@ -688,8 +689,8 @@ int main(int argc, char **argv)
        struct channel *channel;
        struct option *option;
        struct output *op;
-       int ret;
-       char c, *opt_infile, **kv, **opstr;
+       int ret, c;
+       char *opt_infile, **kv, **opstr;
 
        op = malloc(sizeof(struct output));
        op->pd = NULL;
@@ -736,7 +737,8 @@ int main(int argc, char **argv)
                        } else {
                                option = malloc(sizeof(struct option));
                                option->key = g_strdup(kv[0]);
-                               option->value = g_strdup(kv[1]);
+                               option->value = g_variant_new_string(kv[1]);
+                g_variant_ref_sink(option->value);
                                /* Apply to last PD. */
                                pd->options = g_slist_append(pd->options, option);
                        }
@@ -759,6 +761,9 @@ int main(int argc, char **argv)
                                op->type = SRD_OUTPUT_BINARY;
                        else if (!strcmp(opstr[1], "python"))
                                op->type = SRD_OUTPUT_PYTHON;
+                       else if (!strcmp(opstr[1], "exception"))
+                /* Doesn't matter, we just need it to bomb out. */
+                               op->type = SRD_OUTPUT_PYTHON;
                        else {
                                ERR("Unknown output type '%s'", opstr[1]);
                                g_strfreev(opstr);