diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-04-06 12:00:29 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-04-06 12:00:29 +0200 |
| commit | 933d2fe4cfb380f66af631a2203ec23c367e5b1a (patch) | |
| tree | f10581ed0da1911eed9b02e69d999ba481d9d3c6 /Makefile.am | |
| parent | f8835ff4b3dd59d59bf44838d05d3d60114d15d2 (diff) | |
| parent | 998afc3608242b75051f43ece36d52474c51e285 (diff) | |
| download | guix-933d2fe4cfb380f66af631a2203ec23c367e5b1a.tar guix-933d2fe4cfb380f66af631a2203ec23c367e5b1a.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index a9c281d4d1..4c00db1ab3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -183,7 +183,8 @@ KCONFIGS = \ # Templates, examples. EXAMPLES = \ gnu/system/examples/bare-bones.tmpl \ - gnu/system/examples/desktop.tmpl + gnu/system/examples/desktop.tmpl \ + gnu/system/examples/lightweight-desktop.tmpl GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go guix/tests.go @@ -292,10 +293,11 @@ endif BUILD_DAEMON TESTS = $(SCM_TESTS) $(SH_TESTS) -AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)" +AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)" GUILE_AUTO_COMPILE=0 -SCM_LOG_COMPILER = $(top_builddir)/test-env $(GUILE) -AM_SCM_LOG_FLAGS = --no-auto-compile -L "$(top_srcdir)" +SCM_LOG_DRIVER = $(top_builddir)/test-env $(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) AM_SH_LOG_FLAGS = -x -e @@ -345,6 +347,7 @@ EXTRA_DIST = \ build-aux/download.scm \ build-aux/make-binary-tarball.scm \ build-aux/generate-authors.scm \ + build-aux/test-driver.scm \ srfi/srfi-37.scm.in \ srfi/srfi-64.scm \ srfi/srfi-64.upstream.scm \ |