gnu: Add guile-sqlite3.

[jackhill/guix/guix.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d0c1826..8fd1c1b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,10 +38,12 @@ MODULES =                                   \
   guix/hash.scm                                        \
   guix/pk-crypto.scm                           \
   guix/pki.scm                                 \
+  guix/combinators.scm                         \
   guix/utils.scm                               \
   guix/sets.scm                                        \
   guix/download.scm                            \
   guix/git-download.scm                                \
+  guix/hg-download.scm                         \
   guix/monads.scm                              \
   guix/monad-repl.scm                          \
   guix/gexp.scm                                        \
@@ -81,6 +83,7 @@ MODULES =                                     \
   guix/build/cmake-build-system.scm            \
   guix/build/emacs-build-system.scm            \
   guix/build/git.scm                           \
+  guix/build/hg.scm                            \
   guix/build/glib-or-gtk-build-system.scm      \
   guix/build/gnu-build-system.scm              \
   guix/build/gnu-dist.scm                      \
@@ -173,8 +176,8 @@ dist_noinst_DATA = guix/tests.scm
 
 # Linux-Libre configurations.
 KCONFIGS =                                     \
-  gnu/packages/linux-libre-4.5-i686.conf       \
-  gnu/packages/linux-libre-4.5-x86_64.conf     \
+  gnu/packages/linux-libre-4.6-i686.conf       \
+  gnu/packages/linux-libre-4.6-x86_64.conf     \
   gnu/packages/linux-libre-4.4-i686.conf       \
   gnu/packages/linux-libre-4.4-x86_64.conf     \
   gnu/packages/linux-libre-4.1-i686.conf       \
@@ -231,6 +234,7 @@ SCM_TESTS =                                 \
   tests/ui.scm                                 \
   tests/records.scm                            \
   tests/upstream.scm                           \
+  tests/combinators.scm                                \
   tests/utils.scm                              \
   tests/build-utils.scm                                \
   tests/packages.scm                           \
@@ -246,6 +250,7 @@ SCM_TESTS =                                 \
   tests/profiles.scm                           \
   tests/syscalls.scm                           \
   tests/gremlin.scm                            \
+  tests/bournish.scm                           \
   tests/lint.scm                               \
   tests/publish.scm                            \
   tests/scripts.scm                            \
@@ -295,8 +300,11 @@ TESTS = $(SCM_TESTS) $(SH_TESTS)
 
 AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)" GUILE_AUTO_COMPILE=0
 
-SCM_LOG_DRIVER = $(top_builddir)/test-env $(GUILE) --no-auto-compile \
-                   -e main $(top_srcdir)/build-aux/test-driver.scm
+SCM_LOG_DRIVER =                               \
+  $(top_builddir)/test-env --quiet-stderr      \
+  $(GUILE) --no-auto-compile -e main           \
+      $(top_srcdir)/build-aux/test-driver.scm
+
 AM_SCM_LOG_DRIVER_FLAGS = --brief=yes
 
 SH_LOG_COMPILER = $(top_builddir)/test-env $(SHELL)
@@ -325,6 +333,13 @@ check-local:
 
 endif !CAN_RUN_TESTS
 
+check-system: $(GOBJECTS)
+       $(AM_V_at)echo "Running system tests..."
+       $(AM_V_at)$(top_builddir)/pre-inst-env                  \
+          $(GUILE) --no-auto-compile                           \
+          -e '(@@ (run-system-tests) run-system-tests)'        \
+          $(top_srcdir)/build-aux/run-system-tests.scm
+
 # Public key used to sign substitutes from hydra.gnu.org.
 dist_pkgdata_DATA = hydra.gnu.org.pub
 
@@ -349,6 +364,7 @@ EXTRA_DIST =                                                \
   build-aux/make-binary-tarball.scm                    \
   build-aux/generate-authors.scm                       \
   build-aux/test-driver.scm                            \
+  build-aux/run-system-tests.scm                       \
   srfi/srfi-37.scm.in                                  \
   srfi/srfi-64.scm                                     \
   srfi/srfi-64.upstream.scm                            \
@@ -496,7 +512,7 @@ hydra-jobs.scm: $(GOBJECTS)
        $(AM_V_GEN)$(top_builddir)/pre-inst-env "$(GUILE)"              \
          "$(top_srcdir)/build-aux/hydra/evaluate.scm"                  \
          "$(top_srcdir)/build-aux/hydra/gnu-system.scm" > "$@.tmp"
-       $(AT_V_at)mv "$@.tmp" "$@"
+       $(AM_V_at)mv "$@.tmp" "$@"
 
 .PHONY: sync-descriptions gen-ChangeLog gen-AUTHORS clean-go make-go
 .PHONY: assert-no-store-file-names assert-binaries-available