mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
Fixed bench marking of other filesystems.
Added error message if bonnie++ is not installed.
This commit is contained in:
@@ -1,5 +1,11 @@
|
|||||||
##/bin/sh
|
##/bin/sh
|
||||||
|
|
||||||
|
#check bonnie is installed
|
||||||
|
if [ "`whereis bonnie++`" == "bonnie++:"]; then
|
||||||
|
echo $0 error bonnie not installed.
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
run_bonnie()
|
run_bonnie()
|
||||||
{
|
{
|
||||||
# dir, no hostname, quiet, fast (no per-char), ram (no sz checks)
|
# dir, no hostname, quiet, fast (no per-char), ram (no sz checks)
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
##/bin/sh
|
##/bin/sh
|
||||||
|
|
||||||
|
#check dbench is installed
|
||||||
|
if [ "`whereis dbench`" == "dbench:"]; then
|
||||||
|
echo $0 error dbench not installed.
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
_run_dbench()
|
_run_dbench()
|
||||||
{
|
{
|
||||||
mkdir ./dbench || exit 1
|
mkdir ./dbench || exit 1
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
##/bin/sh
|
##/bin/sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved.
|
# Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved.
|
||||||
#
|
#
|
||||||
@@ -187,9 +186,18 @@ _scratch_mkfs()
|
|||||||
nfs*)
|
nfs*)
|
||||||
# do nothing for nfs
|
# do nothing for nfs
|
||||||
;;
|
;;
|
||||||
udf|*)
|
udf*)
|
||||||
$MKFS_PROG -t $FSTYP $MKFS_OPTIONS $* > /dev/null
|
$MKFS_PROG -t $FSTYP $MKFS_OPTIONS $* > /dev/null
|
||||||
;;
|
;;
|
||||||
|
ext2)
|
||||||
|
mkfs.ext2 $MKFS_OPTIONS $* $SCRATCH_DEV > /dev/null
|
||||||
|
;;
|
||||||
|
ext3)
|
||||||
|
mkfs.ext3 $MKFS_OPTIONS $* $SCRATCH_DEV > /dev/null
|
||||||
|
;;
|
||||||
|
reiserfs)
|
||||||
|
mkfs.reiserfs $MKFS_OPTIONS $* $SCRATCH_DEV > /dev/null
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -520,7 +528,7 @@ _require_scratch()
|
|||||||
_notrun "this test requires a valid \$SCRATCH_DEV"
|
_notrun "this test requires a valid \$SCRATCH_DEV"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
nfs*)
|
nfs*|ext2|ext3|reiserfs)
|
||||||
echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1
|
echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1
|
||||||
if [ ! -z "$SCRATCH_DEV" -a ! -b "$SCRATCH_DEV" -a "$?" != "0" ]
|
if [ ! -z "$SCRATCH_DEV" -a ! -b "$SCRATCH_DEV" -a "$?" != "0" ]
|
||||||
then
|
then
|
||||||
|
|||||||
Reference in New Issue
Block a user