summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2010-02-17 16:39:58 +0100
committerAndreas Gruenbacher <agruen@suse.de>2010-04-12 16:27:55 +0200
commit7fa8417c05f8d56b0c6b09412be7a52c30212c32 (patch)
treed945113753e3b2c8c3560cf0bd5466e18cb8345d /tests
parent8d5ea52c7a41f56c296baab0fe23392d38263393 (diff)
downloadpatch-7fa8417c05f8d56b0c6b09412be7a52c30212c32.tar.gz
Convert to automake and use a git submodule for gnulib
* configure.ac: Add automake and gnulib macros, replace several obsolete macros. * Makefile.am, lib/Makefile.am, src/Makefile.am, tests/Makefile.am: Add for automake. * autogen.sh, INSTALL, Makefile.in, mkinstalldirs, update-version.sh: Obsolete; remove. * README-hacking: Import from diffutils, replace cvs with git. * build-aux: Move gnulib auxiliary files here from the top-level directory. * gnulib: Add gnulib git submodule. * bootstrap, bootstrap.conf: Import from gnulib and adjust. * gl/lib: Remove gnulib files from the repository; they are now imported into lib/ from gnulib as needed. * tests/test-lib.sh: Use $abs_top_builddir exported from tests/Makefile.am here instead of $PWD. * m4/utimbuf.m4: This macro has been removed from gnulib. Add it here for now; this will be replaced by gnulib's utimens module soon.
Diffstat (limited to 'tests')
-rw-r--r--tests/.gitignore1
-rw-r--r--tests/Makefile.am50
-rw-r--r--tests/test-lib.sh2
3 files changed, 52 insertions, 1 deletions
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 0000000..397b4a7
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1 @@
+*.log
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..d24b162
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,50 @@
+# Copyright (C) 1989, 1990, 1991, 1992, 1993, 1997, 1998, 1999, 2002,
+# 2003, 2006, 2009, 2010 Free Software Foundation, Inc.
+
+# This program 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.
+
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+
+## Process this file with automake to produce Makefile.in.
+
+TESTS = \
+ asymmetric-hunks \
+ backup-prefix-suffix \
+ corrupt-reject-files \
+ create-delete \
+ crlf-handling \
+ dash-o-append \
+ filename-choice \
+ global-reject-files \
+ inname \
+ line-numbers \
+ merge \
+ munged-context-format \
+ need-filename \
+ no-newline-triggers-assert \
+ preserve-c-function-names \
+ preserve-mode-and-timestamp \
+ reject-format \
+ remember-backup-files \
+ remember-reject-files \
+ unmodified-files
+
+XFAIL_TESTS = \
+ dash-o-append
+
+EXTRA_DIST = \
+ $(TESTS) \
+ test-lib.sh
+
+TESTS_ENVIRONMENT = \
+ export abs_top_builddir=$(abs_top_builddir); \
+ $(TEST_SHELL)
diff --git a/tests/test-lib.sh b/tests/test-lib.sh
index bc46412..d21ff16 100644
--- a/tests/test-lib.sh
+++ b/tests/test-lib.sh
@@ -36,7 +36,7 @@ use_tmpdir() {
}
use_local_patch() {
- test -n "$PATCH" || PATCH=$PWD/src/patch
+ test -n "$PATCH" || PATCH=$abs_top_builddir/src/patch
eval 'patch() {
if test -n "$GDB" ; then