From e54635de96a4bea38c7e4e10ae4e6ccbe9472663 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sun, 6 Aug 2006 14:33:13 -0400 Subject: [PATCH] If diff -u is supported, use it to report test failures. Signed-off-by: "Theodore Ts'o" --- ChangeLog | 4 ++++ configure | 13 ++++++++++++- configure.in | 11 +++++++++++ tests/ChangeLog | 5 +++++ tests/Makefile.in | 1 + tests/test_config | 1 - 6 files changed, 33 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 913ba35..4613e54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-08-06 Theodore Tso + + * configure.in: Add test to see if diff supports the -u option + 2006-04-09 Theodore Ts'o * config/config.guess, config/config.sub: Update to newer versions diff --git a/configure b/configure index ac0f05e..bab6c73 100755 --- a/configure +++ b/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS E2FSPROGS_YEAR E2FSPROGS_MONTH E2FSPROGS_DAY E2FSPROGS_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LD CPP EGREP LINUX_INCLUDE MAINTAINER_CMT HTREE_CMT ELF_CMT BSDLIB_CMT PROFILE_CMT CHECKER_CMT LIB_EXT STATIC_LIB_EXT PROFILED_LIB_EXT SWAPFS_CMT DEBUGFS_CMT IMAGER_CMT RESIZER_CMT E2FSCK_TYPE FSCK_PROG FSCK_MAN E2INITRD_PROG E2INITRD_MAN DEVMAPPER_REQ DEVMAPPER_PC_LIBS DEVMAPPER_LIBS STATIC_DEVMAPPER_LIBS GETTEXT_PACKAGE PACKAGE VERSION SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE RANLIB ac_ct_RANLIB ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB BINARY_TYPE LN LN_S MV CP RM CHMOD AWK SED PERL LDCONFIG AR ac_ct_AR STRIP ac_ct_STRIP BUILD_CC SIZEOF_SHORT SIZEOF_INT SIZEOF_LONG SIZEOF_LONG_LONG SOCKET_LIB DLOPEN_LIB LINUX_CMT CYGWIN_CMT UNIX_CMT root_prefix root_bindir root_sbindir root_libdir root_sysconfdir LDFLAG_STATIC SS_DIR ET_DIR DO_TEST_SUITE INTL_FLAGS BUILD_CFLAGS BUILD_LDFLAGS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS E2FSPROGS_YEAR E2FSPROGS_MONTH E2FSPROGS_DAY E2FSPROGS_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LD CPP EGREP LINUX_INCLUDE MAINTAINER_CMT HTREE_CMT ELF_CMT BSDLIB_CMT PROFILE_CMT CHECKER_CMT LIB_EXT STATIC_LIB_EXT PROFILED_LIB_EXT SWAPFS_CMT DEBUGFS_CMT IMAGER_CMT RESIZER_CMT E2FSCK_TYPE FSCK_PROG FSCK_MAN E2INITRD_PROG E2INITRD_MAN DEVMAPPER_REQ DEVMAPPER_PC_LIBS DEVMAPPER_LIBS STATIC_DEVMAPPER_LIBS GETTEXT_PACKAGE PACKAGE VERSION SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE RANLIB ac_ct_RANLIB ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB BINARY_TYPE LN LN_S MV CP RM CHMOD AWK SED PERL LDCONFIG AR ac_ct_AR STRIP ac_ct_STRIP BUILD_CC SIZEOF_SHORT SIZEOF_INT SIZEOF_LONG SIZEOF_LONG_LONG SOCKET_LIB DLOPEN_LIB UNI_DIFF_OPTS LINUX_CMT CYGWIN_CMT UNIX_CMT root_prefix root_bindir root_sbindir root_libdir root_sysconfdir LDFLAG_STATIC SS_DIR ET_DIR DO_TEST_SUITE INTL_FLAGS BUILD_CFLAGS BUILD_LDFLAGS LIBOBJS LTLIBOBJS' ac_subst_files='MCONFIG MAKEFILE_ELF MAKEFILE_BSDLIB MAKEFILE_PROFILE MAKEFILE_CHECKER MAKEFILE_LIBRARY ASM_TYPES_HEADER' # Initialize some variables set by options. @@ -14128,6 +14128,16 @@ if test $ac_cv_have_optreset = yes; then _ACEOF fi +echo "$as_me:$LINENO: checking for unified diff option" >&5 +echo $ECHO_N "checking for unified diff option... $ECHO_C" >&6 +if diff -u $0 $0 >& /dev/null ; then + UNI_DIFF_OPTS=-u +else + UNI_DIFF_OPTS=-c +fi +echo "$as_me:$LINENO: result: $UNI_DIFF_OPTS" >&5 +echo "${ECHO_T}$UNI_DIFF_OPTS" >&6 + case "$host_os" in linux*) cat >>confdefs.h <<\_ACEOF @@ -15067,6 +15077,7 @@ s,@SIZEOF_LONG@,$SIZEOF_LONG,;t t s,@SIZEOF_LONG_LONG@,$SIZEOF_LONG_LONG,;t t s,@SOCKET_LIB@,$SOCKET_LIB,;t t s,@DLOPEN_LIB@,$DLOPEN_LIB,;t t +s,@UNI_DIFF_OPTS@,$UNI_DIFF_OPTS,;t t s,@LINUX_CMT@,$LINUX_CMT,;t t s,@CYGWIN_CMT@,$CYGWIN_CMT,;t t s,@UNIX_CMT@,$UNIX_CMT,;t t diff --git a/configure.in b/configure.in index d26ca69..ece81dd 100644 --- a/configure.in +++ b/configure.in @@ -687,6 +687,17 @@ if test $ac_cv_have_optreset = yes; then AC_DEFINE(HAVE_OPTRESET) fi dnl +dnl Check for unified diff +dnl +AC_MSG_CHECKING(for unified diff option) +if diff -u $0 $0 >& /dev/null ; then + UNI_DIFF_OPTS=-u +else + UNI_DIFF_OPTS=-c +fi +AC_MSG_RESULT($UNI_DIFF_OPTS) +AC_SUBST(UNI_DIFF_OPTS) +dnl dnl We use the EXT2 ioctls only under Linux dnl case "$host_os" in diff --git a/tests/ChangeLog b/tests/ChangeLog index c5fff15..b44a717 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2006-08-06 Theodore Tso + + * Makefile.in, test_config: If available, use unified diffs to + report test failures + 2006-05-28 Theodore Tso * test_config: Unset all locale-related environment variables diff --git a/tests/Makefile.in b/tests/Makefile.in index c82698d..43acc78 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -19,6 +19,7 @@ test_script: test_script.in Makefile @HTREE_CMT@ @echo "HTREE=y" >> test_script @echo 'EGREP="@EGREP@"' >> test_script @echo "SRCDIR=@srcdir@" >> test_script + @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_script @cat $(srcdir)/test_script.in >> test_script @chmod +x test_script diff --git a/tests/test_config b/tests/test_config index 2169c0c..3c0fae0 100644 --- a/tests/test_config +++ b/tests/test_config @@ -18,7 +18,6 @@ TEST_ICOUNT=../tests/progs/test_icount LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss TMPFILE=./test.img -DIFF_OPTS=-c export LD_LIBRARY_PATH export DYLD_LIBRARY_PATH TZ=GMT -- 1.8.3.1