[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] tests: fix a syntax-check rule to pass in non-srcdir build
From: |
Jim Meyering |
Subject: |
[PATCH] tests: fix a syntax-check rule to pass in non-srcdir build |
Date: |
Sun, 24 Jan 2010 14:57:03 +0100 |
In testing a gnulib maint.mk change (for non-srcdir builds,
which I rarely run) via coreutils, I discovered that the
coreutils-specific sc_x_sc_dist_check test would always fail.
It is probably possible to combine the two sed commands,
but so far it doesn't look easy enough to be worthwhile.
Here's the fix I've pushed:
>From 0caead1ea0b2ef63173cde6b583249bea3194817 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sun, 24 Jan 2010 14:46:58 +0100
Subject: [PATCH] tests: fix a syntax-check rule to pass in non-srcdir build
* cfg.mk (sc_x_sc_dist_check): This coreutils-specific syntax-check
rule would fail in a non-srcdir build, since in that case, each name
from $(VC_LIST) starts with "$(srcdir)/". Fix that.
* gnulib: Update to latest, to pull in a required maint.mk change.
---
cfg.mk | 3 ++-
gnulib | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cfg.mk b/cfg.mk
index b669961..b5a21c3 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -93,7 +93,8 @@ sc_root_tests:
# stays in sync with corresponding files in the repository.
sce = syntax_check_exceptions
sc_x_sc_dist_check:
- @test "$$( ($(VC_LIST) | sed -n '/^.x-sc_/p'; \
+ @test "$$( ($(VC_LIST) | sed -n '/\.x-sc_/p' \
+ | sed 's|^$(_dot_escaped_srcdir)/||'; \
sed -n '/^$(sce) =[ ]*\\$$/,/[^\]$$/p' \
$(srcdir)/Makefile.am \
| sed 's/^ *//;/^$(sce) =/d' \
diff --git a/gnulib b/gnulib
index 7521ea0..8fc05d0 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 7521ea075f22293b395517a5d2f4ea213b63d4a9
+Subproject commit 8fc05d032b3f9a9d068613ab5ee297b4e7d5a08a
--
1.6.6.1.557.g77031
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] tests: fix a syntax-check rule to pass in non-srcdir build,
Jim Meyering <=