INN commit: branches/2.6/tests/util (inndf.t)
INN Commit
rra at isc.org
Sun Nov 6 14:17:38 UTC 2016
Date: Sunday, November 6, 2016 @ 06:17:37
Author: iulius
Revision: 10113
Allow 2^31 - 1 as a valid result from df
Latest version of OSX answers 2^31 - 1, so allow it similarly to
2^32 - 1 that already was allowed.
Modified:
branches/2.6/tests/util/inndf.t
---------+
inndf.t | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: inndf.t
===================================================================
--- inndf.t 2016-11-06 14:15:43 UTC (rev 10112)
+++ inndf.t 2016-11-06 14:17:37 UTC (rev 10113)
@@ -50,9 +50,9 @@
fi
# Make sure df -i works, or we have to just skip this test. Also accept a
-# return value of 2^32 - 1 from inndf regardless of what df says, since this
-# is what Reiser and some other file systems return in some versions of
-# Linux.
+# return value of 2^31 - 1 or 2^32 - 1 from inndf regardless of what df says,
+# since this is what Reiser and some other file systems return in some
+# versions of Linux.
if df -i . > /dev/null 2>&1 ; then
if [ -z "${UNAME_SYSTEM##IRIX[[:alnum:]]*}" ] ; then
real=`df -i . | sed 1d | tr -d '\r\n' | awk '{ print $8 }'`
@@ -64,7 +64,7 @@
real=`df -i . | sed 1d | tr -d '\r\n' | awk '{ print $4 }'`
fi
try=`$inndf -i .`
- if [ "$try" = 4294967295 ] ; then
+ if [ "$try" = 2147483647 ] || [ "$try" = 4294967295 ] ; then
printcount "ok"
else
diff=`expr "$real" - "$try"`
More information about the inn-committers
mailing list