[Parted-commits] GNU Parted Official Repository: Changes to 'master'
Jim Meyering
meyering at alioth.debian.org
Thu Jul 9 17:44:24 UTC 2009
cfg.mk | 1 +
dist-check.mk | 25 ++++---------------------
gnulib | 2 +-
libparted/tests/Makefile.am | 6 +++---
libparted/tests/t1000-label.sh | 4 ++--
libparted/tests/t2000-disk.sh | 4 ++--
tests/Makefile.am | 6 +++---
7 files changed, 16 insertions(+), 32 deletions(-)
New commits:
commit 32dcfa4738ce7a430308615d9e4236e71ba94b66
Author: Jim Meyering <meyering at redhat.com>
Date: Thu Jul 9 19:36:46 2009 +0200
tests: disable the taint-distcheck rule
* dist-check.mk (taint-distcheck): Disable rule, since it
would trigger a bug in libtool-generated scripts.
diff --git a/dist-check.mk b/dist-check.mk
index 40e909c..0f20af2 100644
--- a/dist-check.mk
+++ b/dist-check.mk
@@ -17,28 +17,11 @@ t_prefix = $(tp)/a
t_taint = '$(t_prefix) b'
fake_home = $(tp)/home
-# Ensure that tests run from tainted build and src dir names work,
-# and don't affect anything in $HOME. Create witness files in $HOME,
-# record their attributes, and build/test. Then ensure that the
-# witnesses were not affected.
+# Disable this test, since libtool-generated scripts
+# can't deal with a space-tainted srcdir.
ALL_RECURSIVE_TARGETS += taint-distcheck
-taint-distcheck: $(DIST_ARCHIVES)
- test -d $(t_taint) && chmod -R 700 $(t_taint) || :
- -rm -rf $(t_taint) $(fake_home)
- mkdir -p $(t_prefix) $(t_taint) $(fake_home)
- GZIP=$(GZIP_ENV) $(AMTAR) -C $(t_taint) -zxf $(distdir).tar.gz
- mkfifo $(fake_home)/fifo
- touch $(fake_home)/f
- mkdir -p $(fake_home)/d/e
- ls -lR $(fake_home) $(t_prefix) > $(tp)/.ls-before
- cd $(t_taint)/$(distdir) \
- && ./configure \
- && $(MAKE) \
- && HOME=$(fake_home) $(MAKE) check \
- && ls -lR $(fake_home) $(t_prefix) > $(tp)/.ls-after \
- && diff $(tp)/.ls-before $(tp)/.ls-after \
- && test -d $(t_prefix)
- rm -rf $(tp)
+.PHONY: taint-distcheck
+taint-distcheck:
# Verify that a twisted use of --program-transform-name=PROGRAM works.
define install-transform-check
commit b4bd5b6c1f1cfdbee02820b5dff2a5ec77226bce
Author: Jim Meyering <meyering at redhat.com>
Date: Thu Jul 9 19:07:01 2009 +0200
tests: better quoting to avoid failure with poorly-named src directory
* libparted/tests/Makefile.am (init.sh): Quote, in case
$(abs_top_srcdir) contains e.g., spaces.
* tests/Makefile.am (init.sh): Likewise.
* libparted/tests/t2000-disk.sh: Better quoting here, too.
* libparted/tests/t1000-label.sh: Likewise.
Reported by Joel Granados
diff --git a/libparted/tests/Makefile.am b/libparted/tests/Makefile.am
index 197b02d..d2a7176 100644
--- a/libparted/tests/Makefile.am
+++ b/libparted/tests/Makefile.am
@@ -25,9 +25,9 @@ CLEANFILES = init.sh
all: init.sh
init.sh: Makefile.in
rm -f $@-t $@
- echo 'PARTED_USABLE_TEST_DIR=$(PARTED_USABLE_TEST_DIR)' > $@-t
- echo 'abs_top_srcdir=$(abs_top_srcdir)' >> $@-t
- echo 'PATH=$(abs_builddir)$(PATH_SEPARATOR)$$PATH; export PATH' >> $@-t
+ echo 'PARTED_USABLE_TEST_DIR="$(PARTED_USABLE_TEST_DIR)"' > $@-t
+ echo 'abs_top_srcdir="$(abs_top_srcdir)"' >> $@-t
+ echo 'PATH="$(abs_builddir)$(PATH_SEPARATOR)$$PATH"; export PATH' >> $@-t
chmod a-w $@-t
mv $@-t $@
diff --git a/libparted/tests/t1000-label.sh b/libparted/tests/t1000-label.sh
index 900433f..f77919d 100755
--- a/libparted/tests/t1000-label.sh
+++ b/libparted/tests/t1000-label.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (C) 2007-2008 Free Software Foundation, Inc.
+# Copyright (C) 2007-2009 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
@@ -20,7 +20,7 @@ test_description='run the label unit tests in a directory supporting O_DIRECT'
# in which one can open a file with the O_DIRECT flag.
: ${top_srcdir=../..}
-. $top_srcdir/tests/test-lib.sh
+. "$top_srcdir/tests/test-lib.sh"
test_expect_success \
'run the actual tests' 'label'
diff --git a/libparted/tests/t2000-disk.sh b/libparted/tests/t2000-disk.sh
index ae261a9..2d074b0 100755
--- a/libparted/tests/t2000-disk.sh
+++ b/libparted/tests/t2000-disk.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (C) 2007-2008 Free Software Foundation, Inc.
+# Copyright (C) 2007-2009 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
@@ -20,7 +20,7 @@ test_description='run the disk unit tests in a directory supporting O_DIRECT'
# in which one can open a file with the O_DIRECT flag.
: ${top_srcdir=../..}
-. $top_srcdir/tests/test-lib.sh
+. "$top_srcdir/tests/test-lib.sh"
test_expect_success \
'run the actual tests' 'disk'
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7b532ff..9c17c06 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -35,9 +35,9 @@ CLEANFILES = init.sh
all: init.sh
init.sh: Makefile.in
rm -f $@-t $@
- echo 'PARTED_USABLE_TEST_DIR=$(PARTED_USABLE_TEST_DIR)' > $@-t
- echo 'abs_top_srcdir=$(abs_top_srcdir)' >> $@-t
- echo 'PATH=$(parted_dir)$(sep)$(pp_dir)$(sep)$$PATH' >> $@-t
+ echo 'PARTED_USABLE_TEST_DIR="$(PARTED_USABLE_TEST_DIR)"' > $@-t
+ echo 'abs_top_srcdir="$(abs_top_srcdir)"' >> $@-t
+ echo 'PATH="$(parted_dir)$(sep)$(pp_dir)$(sep)$$PATH"' >> $@-t
echo 'export PATH' >> $@-t
chmod a-w $@-t
mv $@-t $@
commit b66c47841420c5295ee0ad39ad9637c78f107960
Author: Jim Meyering <meyering at redhat.com>
Date: Thu Jul 9 18:07:28 2009 +0200
build: update from gnulib
* gnulib: Update submodule to latest.
* cfg.mk (local-checks-to-skip): Add sc_require_test_exit_idiom.
This skips a new-from-gnulib test that doesn't apply here.
diff --git a/cfg.mk b/cfg.mk
index b3829c5..f58d4cc 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -36,6 +36,7 @@ local-checks-to-skip = \
sc_prohibit_strcmp \
sc_changelog \
sc_prohibit_atoi_atof \
+ sc_require_test_exit_idiom \
sc_system_h_headers \
sc_space_tab \
sc_tight_scope \
diff --git a/gnulib b/gnulib
index ea5142f..b653eda 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit ea5142f7369225f5aef66f89f9b9d1421c6dceff
+Subproject commit b653eda3ac4864de205419d9f41eec267cb89eeb
More information about the Parted-commits
mailing list