python: Pakfire.execute(): Fix parsing some arguments

[pakfire.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a113ea4ff76532fc309ab6a80b2d0dcaaac7cd09..2fbead80e7d75fca4f802133acb5fcb9b3f833cd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -317,7 +317,6 @@ libpakfire_la_CFLAGS = \
        $(JSON_C_CFLAGS) \
        $(KRB5_CFLAGS) \
        $(MAGIC_CFLAGS) \
-       $(MOUNT_CFLAGS) \
        $(NL3_CFLAGS) \
        $(NL3_ROUTE_CFLAGS) \
        $(OPENSSL_CFLAGS) \
@@ -351,7 +350,6 @@ libpakfire_la_LIBADD = \
        $(KRB5_LIBS) \
        $(LZMA_LIBS) \
        $(MAGIC_LIBS) \
-       $(MOUNT_LIBS) \
        $(NL3_LIBS) \
        $(NL3_ROUTE_LIBS) \
        $(OPENSSL_LIBS) \
@@ -1131,16 +1129,29 @@ TESTSUITE_LDADD = \
        libpakfire-internal.la
 
 TESTS_ENVIRONMENT = \
+       TEST_CONFIG_FILE="$(abs_top_srcdir)/tests/pakfire.conf" \
        TEST_DATA_DIR="$(abs_top_srcdir)/tests/data" \
        TEST_STUB_ROOT="$(TEST_STUB_ROOT)" \
        PAKFIRE_LOG=debug \
        topdir="$(shell pwd)"
 
+# Test the library we just built
+TESTS_ENVIRONMENT += \
+       LD_LIBRARY_PATH=$(top_srcdir)/.libs:$(LD_LIBRARY_PATH)
+
+# Test the Python modules we just built
+TESTS_ENVIRONMENT += \
+       PYTHONPATH=$(top_srcdir)/src:$(top_srcdir)/.libs:$(PYTHONPATH)
+
 dist_check_SCRIPTS = \
+       tests/python/archive.py \
+       tests/python/ctx.py \
        tests/python/keys.py \
        tests/python/jail.py \
-       tests/python/package.py \
-       tests/python/test.py
+       tests/python/package.py
+
+EXTRA_DIST += \
+       tests/python/tests.py
 
 TESTS = \
        $(check_PROGRAMS) \