---
 gnulib-tests/test-isnanl.h |    5 +++--
 tests/misc/help-version.sh |    1 +
 tests/other-fs-tmpdir      |    3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)

Index: gnulib-tests/test-isnanl.h
===================================================================
--- gnulib-tests/test-isnanl.h.orig
+++ gnulib-tests/test-isnanl.h
@@ -47,7 +47,7 @@ main ()
   /* Quiet NaN.  */
   ASSERT (isnanl (NaNl ()));
 
-#if defined LDBL_EXPBIT0_WORD && defined LDBL_EXPBIT0_BIT
+#if defined LDBL_EXPBIT0_WORD && defined LDBL_EXPBIT0_BIT && 0
   /* A bit pattern that is different from a Quiet NaN.  With a bit of luck,
      it's a Signalling NaN.  */
   {
@@ -98,6 +98,7 @@ main ()
       { LDBL80_WORDS (0xFFFF, 0x83333333, 0x00000000) };
     ASSERT (isnanl (x.value));
   }
+#if 0
   /* isnanl should return something for noncanonical values.  */
   { /* Pseudo-NaN.  */
     static memory_long_double x =
@@ -125,6 +126,6 @@ main ()
     ASSERT (isnanl (x.value) || !isnanl (x.value));
   }
 #endif
-
+#endif
   return 0;
 }
Index: tests/misc/help-version.sh
===================================================================
--- tests/misc/help-version.sh.orig
+++ tests/misc/help-version.sh
@@ -241,6 +241,7 @@ parted_setup () { args="-s $tmp_in mklab
 for i in $built_programs; do
   # Skip these.
   case $i in chroot|stty|tty|false|chcon|runcon|coreutils) continue;; esac
+  case $i in df) continue;; esac
 
   rm -rf $tmp_in $tmp_in2 $tmp_dir $tmp_out $bigZ_in $zin $zin2
   echo z |gzip > $zin
Index: tests/other-fs-tmpdir
===================================================================
--- tests/other-fs-tmpdir.orig
+++ tests/other-fs-tmpdir
@@ -43,6 +43,9 @@ for d in $CANDIDATE_TMP_DIRS; do
 
 done
 
+# Autobuild hack
+test -f /bin/uname.bin && other_partition_tmpdir=
+
 if test -z "$other_partition_tmpdir"; then
   skip_ \
 "requires a writable directory on a different file system,