tests: Move 'guix package' tests that require networking to a separate file.

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

diff --git a/Makefile.am b/Makefile.am
index c482848..d54e281 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,7 @@ MODULES =                                     \
   guix/base32.scm                              \
   guix/base64.scm                              \
   guix/records.scm                             \
+  guix/gcrypt.scm                              \
   guix/hash.scm                                        \
   guix/pk-crypto.scm                           \
   guix/pki.scm                                 \
@@ -52,6 +53,7 @@ MODULES =                                     \
   guix/build-system/gnu.scm                    \
   guix/build-system/perl.scm                   \
   guix/build-system/python.scm                 \
+  guix/build-system/waf.scm                    \
   guix/build-system/ruby.scm                   \
   guix/build-system/trivial.scm                        \
   guix/ftp-client.scm                          \
@@ -59,6 +61,7 @@ MODULES =                                     \
   guix/gnupg.scm                               \
   guix/elf.scm                                 \
   guix/store.scm                               \
+  guix/cvs-download.scm                                \
   guix/svn-download.scm                                \
   guix/ui.scm                                  \
   guix/build/download.scm                      \
@@ -70,13 +73,16 @@ MODULES =                                   \
   guix/build/perl-build-system.scm             \
   guix/build/python-build-system.scm           \
   guix/build/ruby-build-system.scm             \
+  guix/build/waf-build-system.scm              \
   guix/build/store-copy.scm                    \
   guix/build/utils.scm                         \
   guix/build/union.scm                         \
   guix/build/pull.scm                          \
   guix/build/rpath.scm                         \
+  guix/build/cvs.scm                           \
   guix/build/svn.scm                           \
   guix/build/syscalls.scm                      \
+  guix/build/gremlin.scm                       \
   guix/build/emacs-utils.scm                   \
   guix/build/graft.scm                         \
   guix/packages.scm                            \
@@ -91,7 +97,7 @@ MODULES =                                     \
   guix/scripts/gc.scm                          \
   guix/scripts/hash.scm                                \
   guix/scripts/pull.scm                                \
-  guix/scripts/substitute-binary.scm           \
+  guix/scripts/substitute.scm                  \
   guix/scripts/authenticate.scm                        \
   guix/scripts/refresh.scm                     \
   guix/scripts/system.scm                      \
@@ -99,6 +105,7 @@ MODULES =                                    \
   guix/scripts/import/gnu.scm                  \
   guix/scripts/import/nix.scm                  \
   guix/scripts/environment.scm                 \
+  guix/scripts/publish.scm                     \
   guix.scm                                     \
   $(GNU_SYSTEM_MODULES)
 
@@ -128,7 +135,9 @@ EXAMPLES =                                  \
 
 GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go guix/tests.go
 
-nobase_dist_guilemodule_DATA = $(MODULES) $(KCONFIGS) $(EXAMPLES)
+nobase_dist_guilemodule_DATA =                  \
+  $(MODULES) $(KCONFIGS) $(EXAMPLES)            \
+  $(MISC_DISTRO_FILES)
 nobase_nodist_guilemodule_DATA = $(GOBJECTS) guix/config.scm
 
 # Do we need to provide our own non-broken (srfi srfi-37) module?
@@ -155,7 +164,7 @@ SCM_TESTS =                                 \
   tests/pk-crypto.scm                          \
   tests/pki.scm                                        \
   tests/sets.scm                               \
-  tests/substitute-binary.scm                  \
+  tests/substitute.scm                         \
   tests/builders.scm                           \
   tests/derivations.scm                                \
   tests/ui.scm                                 \
@@ -171,7 +180,9 @@ SCM_TESTS =                                 \
   tests/union.scm                              \
   tests/profiles.scm                           \
   tests/syscalls.scm                           \
-  tests/lint.scm
+  tests/gremlin.scm                            \
+  tests/lint.scm                               \
+  tests/publish.scm
 
 if HAVE_GUILE_JSON
 
@@ -194,6 +205,7 @@ SH_TESTS =                                  \
   tests/guix-gc.sh                             \
   tests/guix-hash.sh                           \
   tests/guix-package.sh                                \
+  tests/guix-package-net.sh                    \
   tests/guix-system.sh                         \
   tests/guix-archive.sh                                \
   tests/guix-authenticate.sh                   \
@@ -268,10 +280,18 @@ AM_V_GUILEC = $(AM_V_GUILEC_$(V))
 AM_V_GUILEC_ = $(AM_V_GUILEC_$(AM_DEFAULT_VERBOSITY))
 AM_V_GUILEC_0 = @echo "  GUILEC" $@;
 
+# Unset 'GUILE_LOAD_COMPILED_PATH' altogether while compiling.  Otherwise, if
+# $GUILE_LOAD_COMPILED_PATH contains $(moduledir), we may find .go files in
+# there that are newer than the local .scm files (for instance because the
+# user ran 'make install' recently).  When that happens, we end up loading
+# those previously-installed .go files, which may be stale, thereby breaking
+# the whole thing.
+#
 # XXX: Use the C locale for when Guile lacks
 # <http://git.sv.gnu.org/cgit/guile.git/commit/?h=stable-2.0&id=e2c6bf3866d1186c60bacfbd4fe5037087ee5e3f>.
 .scm.go:
        $(AM_V_GUILEC)$(MKDIR_P) `dirname "$@"` ;                       \
+       unset GUILE_LOAD_COMPILED_PATH ;                                \
        LC_ALL=C                                                        \
        $(top_builddir)/pre-inst-env                                    \
        $(GUILD) compile -L "$(top_builddir)" -L "$(top_srcdir)"        \
@@ -322,7 +342,8 @@ dist-hook: sync-descriptions gen-ChangeLog assert-no-store-file-names
 distcheck-hook: assert-binaries-available assert-final-inputs-self-contained
 
 sync-descriptions:
-       -$(top_builddir)/pre-inst-env guix lint --checkers=gnu-description
+       -GUIX_PACKAGE_PATH= \
+        $(top_builddir)/pre-inst-env guix lint --checkers=gnu-description
 
 gen-ChangeLog:
        if test -d .git; then                           \