mirror/findutils
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/findutils.git synced 2026-01-26 15:39:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Also build the relevant gnulib unit tests

Browse Source
This commit is contained in:
James Youngman 2007-03-03 22:42:17 +00:00
parent 404de03d73
commit e254e6a6f6
5 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -17,3 +17,4 @@ gnulib
install-sh
link-warning.h
gnulib-cvs
tests

10
ChangeLog
View File

@ -1,5 +1,15 @@
2007-03-03 James Youngman <jay@gnu.org>
* import-gnulib.sh: Pass --with-tests to gnulib-tool so that relevant
gnulib unit tests are built and are run for "make check".
* configure.in (AC_CONFIG_FILES): Add tests/Makefile (the makefile
for the gnulib unit tests).
* Makefile.am: Add 'tests' to SUBDIRS.
* .cvsignore: Add 'tests'.
* import-gnulib.config (modules): Also use Gnulib modules
mbscasestr and mbsstr in order to perform correct string searching
in multibyte strings, in order to fix Savannah bug #14535.

3
Makefile.am
View File

@ -3,7 +3,8 @@ AUTOMAKE_OPTIONS=gnits
EXTRA_DIST = COPYING ChangeLog TODO install-sh config.h.in stamp-h.in \
THANKS config.rpath import-gnulib.sh import-gnulib.config
SUBDIRS = gnulib lib find xargs locate doc po m4
# "tests" is the gnulib unit test dir.
SUBDIRS = gnulib tests lib find xargs locate doc po m4
ACLOCAL_AMFLAGS = -I gnulib/m4 -I m4

1
configure.in
View File

@ -229,6 +229,7 @@ AC_DEFINE([FINDUTILS], 1, [Define if we are compiling GNU findutils])
AC_CONFIG_FILES(gnulib/Makefile gnulib/lib/Makefile)
AC_CONFIG_FILES(m4/Makefile)
AC_CONFIG_FILES([Makefile
tests/Makefile
find/Makefile find/testsuite/Makefile
xargs/Makefile xargs/testsuite/Makefile
locate/Makefile locate/testsuite/Makefile

18
import-gnulib.sh
View File

@ -37,6 +37,8 @@ unset CDPATH
configfile="./import-gnulib.config"
cvsdir="gnulib-cvs"
tool="${cvsdir}"/gnulib/gnulib-tool
source $configfile
if [ -z "$gnulib_version" ]
@ -91,21 +93,19 @@ fi
set +x
)
set x $cvsdir/gnulib ; shift
if test -f "$1"/gnulib-tool
if test -f "$tool"
then
true
else
echo "$1/gnulib-tool does not exist, did you specify the right directory?" >&2
echo "$tool does not exist, did you specify the right directory?" >&2
exit 1
fi
if test -x "$1"/gnulib-tool
if test -x "$tool"
then
true
else
echo "$1/gnulib-tool is not executable" >&2
echo "$tool is not executable" >&2
exit 1
fi
@ -118,11 +118,11 @@ fi
mkdir gnulib
if "$1"/gnulib-tool --import --symlink --dir=. --lib=libgnulib --source-base=gnulib/lib --m4-base=gnulib/m4 $modules
if "$tool" --import --symlink --with-tests --dir=. --lib=libgnulib --source-base=gnulib/lib --m4-base=gnulib/m4 $modules
then
: OK
else
echo "gnulib-tool failed, exiting." >&2
echo "$tool failed, exiting." >&2
exit 1
fi
@ -132,7 +132,7 @@ for file in $extra_files; do
*/mdate-sh | */texinfo.tex) dest=doc;;
*) dest=.;;
esac
cp -fp "$1"/$file $dest || exit
cp -fp "${cvsdir}"/gnulib/"$file" "$dest" || exit
done