problem: Store a reference to the context

[people/ms/pakfire.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 660ec4b107c6a04af41f2c529f880bd3cf4a8d24..2fbead80e7d75fca4f802133acb5fcb9b3f833cd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -237,12 +237,12 @@ libpakfire_la_SOURCES = \
        src/libpakfire/mirror.c \
        src/libpakfire/mirrorlist.c \
        src/libpakfire/mount.c \
-       src/libpakfire/namespace.c \
        src/libpakfire/os.c \
        src/libpakfire/package.c \
        src/libpakfire/packager.c \
        src/libpakfire/packagelist.c \
        src/libpakfire/pakfire.c \
+       src/libpakfire/parse.c \
        src/libpakfire/parser.c \
        src/libpakfire/path.c \
        src/libpakfire/problem.c \
@@ -285,12 +285,12 @@ pkginclude_HEADERS += \
        src/libpakfire/include/pakfire/mirror.h \
        src/libpakfire/include/pakfire/mirrorlist.h \
        src/libpakfire/include/pakfire/mount.h \
-       src/libpakfire/include/pakfire/namespace.h \
        src/libpakfire/include/pakfire/os.h \
        src/libpakfire/include/pakfire/package.h \
        src/libpakfire/include/pakfire/packager.h \
        src/libpakfire/include/pakfire/packagelist.h \
        src/libpakfire/include/pakfire/pakfire.h \
+       src/libpakfire/include/pakfire/parse.h \
        src/libpakfire/include/pakfire/parser.h \
        src/libpakfire/include/pakfire/path.h \
        src/libpakfire/include/pakfire/private.h \
@@ -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) \
@@ -599,7 +597,6 @@ check_PROGRAMS += \
        tests/libpakfire/db \
        tests/libpakfire/dependencies \
        tests/libpakfire/digest \
-       tests/libpakfire/downloader \
        tests/libpakfire/file \
        tests/libpakfire/httpclient \
        tests/libpakfire/jail \
@@ -613,7 +610,8 @@ check_PROGRAMS += \
        tests/libpakfire/repo \
        tests/libpakfire/snapshot \
        tests/libpakfire/string \
-       tests/libpakfire/util
+       tests/libpakfire/util \
+       tests/libpakfire/xfer
 
 dist_tests_libpakfire_main_SOURCES = \
        tests/libpakfire/main.c
@@ -735,18 +733,6 @@ tests_libpakfire_digest_CFLAGS = \
 tests_libpakfire_digest_LDADD = \
        $(TESTSUITE_LDADD)
 
-dist_tests_libpakfire_downloader_SOURCES = \
-       tests/libpakfire/downloader.c
-
-tests_libpakfire_downloader_CPPFLAGS = \
-       $(TESTSUITE_CPPFLAGS)
-
-tests_libpakfire_downloader_CFLAGS = \
-       $(TESTSUITE_CFLAGS)
-
-tests_libpakfire_downloader_LDADD = \
-       $(TESTSUITE_LDADD)
-
 dist_tests_libpakfire_file_SOURCES = \
        tests/libpakfire/file.c
 
@@ -915,6 +901,18 @@ tests_libpakfire_util_CFLAGS = \
 tests_libpakfire_util_LDADD = \
        $(TESTSUITE_LDADD)
 
+dist_tests_libpakfire_xfer_SOURCES = \
+       tests/libpakfire/xfer.c
+
+tests_libpakfire_xfer_CPPFLAGS = \
+       $(TESTSUITE_CPPFLAGS)
+
+tests_libpakfire_xfer_CFLAGS = \
+       $(TESTSUITE_CFLAGS)
+
+tests_libpakfire_xfer_LDADD = \
+       $(TESTSUITE_LDADD)
+
 # ------------------------------------------------------------------------------
 
 noinst_PROGRAMS += \
@@ -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) \