summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtyom Poptsov <poptsov.artyom@gmail.com>2014-01-31 18:02:41 +0400
committerArtyom Poptsov <poptsov.artyom@gmail.com>2014-01-31 18:02:41 +0400
commitf84441ea65e2fe4c6ece81fbd3daa497024d89f5 (patch)
tree9fe90a6c878542cccf203e47b19c3d9b3b2c7866
parenttests/server-client.scm: New test suite. (diff)
downloadguile-ssh-f84441ea65e2fe4c6ece81fbd3daa497024d89f5.tar.gz
Makefile.am: Move AM tests to `tests/Makefile.am'.
* Makefile.am: Move AM tests to `tests/Makefile.am'. (SUBDIRS): Add `tests'. * tests/Makefile.am: New file. * configure.ac (AC_CONFIG_FILES): Add `tests/Makefile'.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am21
-rw-r--r--configure.ac2
-rw-r--r--tests/Makefile.am35
4 files changed, 42 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index 7864fe5..6f73151 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-01-31 Artyom Poptsov <poptsov.artyom@gmail.com>
+ * Makefile.am: Move AM tests to `tests/Makefile.am'.
+ (SUBDIRS): Add `tests'.
+ * tests/Makefile.am: New file.
+ * configure.ac (AC_CONFIG_FILES): Add `tests/Makefile'.
+
* tests/server-client.scm: New test suite.
* Makefile.am (SCM_TESTS): Add `server-client' TS.
diff --git a/Makefile.am b/Makefile.am
index 0f55470..206f6dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,23 +19,4 @@
ACLOCAL_AMFLAGS = -I m4 --install
-SUBDIRS = src examples build-aux m4 doc
-
-# Tests.
-
-SCM_TESTS = \
- tests/server.scm \
- tests/session.scm \
- tests/client-server.scm \
- tests/server-client.scm
-
-TESTS = ${SCM_TESTS}
-
-TEST_EXTENSIONS = .scm
-
-AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)"
-
-SCM_LOG_COMPILER = $(GUILE)
-AM_SCM_LOG_FLAGS = -L "$(abs_top_srcdir)" --no-auto-compile
-
-CLEANFILES = $(SCM_TESTS:tests/%.scm=%.log)
+SUBDIRS = src examples build-aux m4 doc tests
diff --git a/configure.ac b/configure.ac
index a045964..6d48261 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,7 +77,7 @@ LIBGUILE_SSH_INTERFACE="4:0:0"
AC_SUBST(LIBGUILE_SSH_INTERFACE)
AC_CONFIG_FILES([Makefile src/Makefile examples/Makefile build-aux/Makefile])
-AC_CONFIG_FILES([m4/Makefile doc/Makefile])
+AC_CONFIG_FILES([m4/Makefile doc/Makefile tests/Makefile])
# Generate a Makefile, based on the results.
AC_OUTPUT
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..2bc428c
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,35 @@
+## Config file for GNU Automake.
+##
+## Copyright (C) 2014 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+##
+## This file is part of libguile-ssh.
+##
+## libguile-ssh is free software: you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation, either version 3 of the
+## License, or (at your option) any later version.
+##
+## libguile-ssh is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with libguile-ssh. If not, see <http://www.gnu.org/licenses/>.
+
+SCM_TESTS = \
+ server.scm \
+ session.scm \
+ client-server.scm \
+ server-client.scm
+
+TESTS = ${SCM_TESTS}
+
+TEST_EXTENSIONS = .scm
+
+AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)"
+
+SCM_LOG_COMPILER = $(GUILE)
+AM_SCM_LOG_FLAGS = -L "$(abs_top_srcdir)" --no-auto-compile
+
+CLEANFILES = $(SCM_TESTS:tests/%.scm=%.log)