[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug-diffutils] patch - make check on cygwin
From: |
Eric Blake |
Subject: |
[bug-diffutils] patch - make check on cygwin |
Date: |
Thu, 19 Nov 2009 22:04:17 -0700 |
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.23) Gecko/20090812 Thunderbird/2.0.0.23 Mnenhy/0.7.6.666 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
I noticed that you updated src/paths.h to no longer use hard-coded names;
but in an incremental tree, your Makefile.am change didn't propogate to
the pre-built file, so I still ended up getting a make failure.
Meanwhile, help-version choked on EXEEXT problems on cygwin. How about
the following patch, plus a gnulib update to avoid link failure on
test-xalloc-die?
- --
Don't work too hard, make some time for fun as well!
Eric Blake address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAksGI1EACgkQ84KuGfSFAYB1WgCgxCQ52GplZu33ArNFAOHu2uBx
5VwAoJhCpbjLVAn5WcZQ9gJtGXV95g+O
=aoe/
-----END PGP SIGNATURE-----
>From 05353eb96cebe7053663258459c601b679e0b57d Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Thu, 19 Nov 2009 09:15:28 -0700
Subject: [PATCH] build: fix test run on cygwin
This, plus a gnulib update for xalloc-die-tests, are necessary
for make check to pass on cygwin.
* tests/Makefile.am (built_programs): Ignore $(EXEEXT).
* src/Makefile.am (paths.h): Add missing dependency.
---
src/Makefile.am | 2 +-
tests/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 84f330d..910a101 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,6 +39,6 @@ cmp.$(OBJEXT) diff3.$(OBJEXT) diff.$(OBJEXT) sdiff.$(OBJEXT):
paths.h
gdiff = `echo diff|sed '$(transform)'`
BUILT_SOURCES = paths.h
-paths.h:
+paths.h: Makefile.am
$(AM_V_GEN)(echo '#define DEFAULT_DIFF_PROGRAM "'$(gdiff)'"' && \
echo '#define LOCALEDIR "$(localedir)"') >address@hidden && mv
address@hidden $@
diff --git a/tests/Makefile.am b/tests/Makefile.am
index daec940..8374fba 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -49,6 +49,6 @@ TESTS_ENVIRONMENT = \
built_programs = \
echo 'spy:;@echo $$(PROGRAMS)' \
| MAKEFLAGS= $(MAKE) -s -C $(builddir)/../src -f Makefile -f - spy \
- | fmt -1 | sort -u
+ | fmt -1 | sed 's,$(EXEEXT)$$,,' | sort -u
VERBOSE = yes
--
1.6.4.2
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [bug-diffutils] patch - make check on cygwin,
Eric Blake <=