From 39e2a4cff85cd37797c062a6196d4ce465398d00 Mon Sep 17 00:00:00 2001 From: =?utf8?q?P=C3=A1draig=20Brady?= Date: Wed, 2 Jul 2014 10:16:04 +0100 Subject: [PATCH] tests: avoid errors on systems without getmntent * tests/df/no-mtab-status.sh: Skip if getmntent() not available. * tests/df/skip-duplicates.sh: Likewise. Fixes http://bugs.gnu.org/17863 --- tests/df/no-mtab-status.sh | 6 ++++++ tests/df/skip-duplicates.sh | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/tests/df/no-mtab-status.sh b/tests/df/no-mtab-status.sh index f2fda5e656..9ea2036ddd 100755 --- a/tests/df/no-mtab-status.sh +++ b/tests/df/no-mtab-status.sh @@ -23,6 +23,12 @@ require_gcc_shared_ df || skip_ "df fails" +grep '^#define HAVE_MNTENT_H 1' $CONFIG_HEADER > /dev/null \ + || skip_ "no mntent.h available to confirm the interface" + +grep '^#define HAVE_GETMNTENT 1' $CONFIG_HEADER > /dev/null \ + || skip_ "getmntent is not used on this system" + # Simulate "mtab" failure. cat > k.c <<'EOF' || framework_failure_ #include diff --git a/tests/df/skip-duplicates.sh b/tests/df/skip-duplicates.sh index 9f0f749fef..52b9014a36 100755 --- a/tests/df/skip-duplicates.sh +++ b/tests/df/skip-duplicates.sh @@ -28,6 +28,12 @@ df --local || skip_ "df fails" export CU_NONROOT_FS=$(df --local --output=target 2>&1 | grep /. | head -n1) test -z "$CU_NONROOT_FS" && unique_entries=1 || unique_entries=2 +grep '^#define HAVE_MNTENT_H 1' $CONFIG_HEADER > /dev/null \ + || skip_ "no mntent.h available to confirm the interface" + +grep '^#define HAVE_GETMNTENT 1' $CONFIG_HEADER > /dev/null \ + || skip_ "getmntent is not used on this system" + # Simulate an mtab file to test various cases. cat > k.c <<'EOF' || framework_failure_ #include -- 2.47.2