From d357ecafccdec915c7457d62ea6c87cc97bb9e3b Mon Sep 17 00:00:00 2001 From: ptools Date: Wed, 28 Jul 2004 08:12:22 +0000 Subject: [PATCH] Fixed for UDF tests. This is a workaround for IRIX UDF not supporting symlinks but Linux UDF does.the new version. --- 005 | 55 ++++++++++++++++++---------------------- 019 | 49 ++++++++++++++--------------------- 076 | 49 ++++++++++++++--------------------- common.rc | 76 +++++++++++++++++++++++++++---------------------------- 4 files changed, 101 insertions(+), 128 deletions(-) diff --git a/005 b/005 index 276df0fa..2d5ba889 100755 --- a/005 +++ b/005 @@ -4,35 +4,24 @@ # Test symlinks & ELOOP # #----------------------------------------------------------------------- -# Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it would be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# Further, this software is distributed without any warranty that it is -# free of the rightful claim of any third person regarding infringement -# or the like. Any license provided herein, whether implied or -# otherwise, applies only to this software file. Patent licenses, if -# any, provided herein do not apply to combinations of this program with -# other software, or any other product whatsoever. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write the Free Software Foundation, Inc., 59 -# Temple Place - Suite 330, Boston MA 02111-1307, USA. -# -# Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, -# Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# -# http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ +# Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved. +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA +# +# Contact information: Silicon Graphics, Inc., 1500 Crittenden Lane, +# Mountain View, CA 94043, USA, or: http://www.sgi.com #----------------------------------------------------------------------- # # creator @@ -77,7 +66,13 @@ _link_out_file $seq.out # real QA test starts here _supported_fs xfs udf nfs -_supported_os IRIX Linux + +# IRIX UDF does not support symlinks +if [ $FSTYP == 'udf' ]; then + _supported_os Linux +else + _supported_os Linux IRIX +fi _setup_testdir diff --git a/019 b/019 index dc423f0a..cec3d349 100755 --- a/019 +++ b/019 @@ -4,35 +4,24 @@ # mkfs protofile test # #----------------------------------------------------------------------- -# Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it would be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# Further, this software is distributed without any warranty that it is -# free of the rightful claim of any third person regarding infringement -# or the like. Any license provided herein, whether implied or -# otherwise, applies only to this software file. Patent licenses, if -# any, provided herein do not apply to combinations of this program with -# other software, or any other product whatsoever. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write the Free Software Foundation, Inc., 59 -# Temple Place - Suite 330, Boston MA 02111-1307, USA. -# -# Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, -# Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# -# http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ +# Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved. +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA +# +# Contact information: Silicon Graphics, Inc., 1500 Crittenden Lane, +# Mountain View, CA 94043, USA, or: http://www.sgi.com #----------------------------------------------------------------------- # # creator @@ -86,7 +75,7 @@ protofile=$tmp.proto tempfile=$tmp.file echo fish >$tempfile -$here/src/devzero -b 2048 -n 2 $tempfile.2 -c -v 44 +$here/src/devzero -b 2048 -n 2 -c -v 44 $tempfile.2 cat >$protofile </dev/null 2>&1 echo "*** MKFS ***" >>$seq.full echo "" >>$seq.full -_scratch_mkfs_xfs >>$seq.full 2>&1 \ +_scratch_mkfs >>$seq.full 2>&1 \ || _fail "mkfs failed" _scratch_mount >>$seq.full 2>&1 \ || _fail "mount failed" diff --git a/common.rc b/common.rc index bcb720e8..233f8d8e 100644 --- a/common.rc +++ b/common.rc @@ -1,36 +1,24 @@ ##/bin/sh +#----------------------------------------------------------------------- +# Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved. +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # -# Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it would be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# Further, this software is distributed without any warranty that it is -# free of the rightful claim of any third person regarding infringement -# or the like. Any license provided herein, whether implied or -# otherwise, applies only to this software file. Patent licenses, if -# any, provided herein do not apply to combinations of this program with -# other software, or any other product whatsoever. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write the Free Software Foundation, Inc., 59 -# Temple Place - Suite 330, Boston MA 02111-1307, USA. -# -# Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, -# Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# -# http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # - +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA +# +# Contact information: Silicon Graphics, Inc., 1500 Crittenden Lane, +# Mountain View, CA 94043, USA, or: http://www.sgi.com +#----------------------------------------------------------------------- _mount_opts() { @@ -186,7 +174,7 @@ _scratch_mkfs() nfs*) # do nothing for nfs ;; - udf*) + udf) $MKFS_UDF_PROG $MKFS_OPTIONS $* $SCRATCH_DEV > /dev/null ;; *) @@ -665,7 +653,7 @@ _check_xfs_filesystem() { if [ $# -ne 3 ] then - echo "Usage: _check_fs device |none |none" 1>&2 + echo "Usage: _check_xfs_filesystem device |none |none" 1>&2 exit 1 fi @@ -704,9 +692,9 @@ _check_xfs_filesystem() | tee $tmp.logprint | grep -q "" if [ $? -ne 0 -a "$HOSTOS" = "Linux" ] then - echo "_check_fs: filesystem on $device has dirty log (see $seq.full)" + echo "_check_xfs_filesystem: filesystem on $device has dirty log (see $seq.full)" - echo "_check_fs: filesystem on $device has dirty log" >>$here/$seq.full + echo "_check_xfs_filesystem: filesystem on $device has dirty log" >>$here/$seq.full echo "*** xfs_logprint -t output ***" >>$here/$seq.full cat $tmp.logprint >>$here/$seq.full echo "*** end xfs_logprint output" >>$here/$seq.full @@ -718,9 +706,9 @@ _check_xfs_filesystem() _fix_malloc >$tmp.fs_check if [ -s $tmp.fs_check ] then - echo "_check_fs: filesystem on $device is inconsistent (c) (see $seq.full)" + echo "_check_xfs_filesystem: filesystem on $device is inconsistent (c) (see $seq.full)" - echo "_check_fs: filesystem on $device is inconsistent" >>$here/$seq.full + echo "_check_xfs_filesystem: filesystem on $device is inconsistent" >>$here/$seq.full echo "*** xfs_check output ***" >>$here/$seq.full cat $tmp.fs_check >>$here/$seq.full echo "*** end xfs_check output" >>$here/$seq.full @@ -732,9 +720,9 @@ _check_xfs_filesystem() $XFS_REPAIR_PROG -n $extra_log_options $extra_rt_options $device >$tmp.repair 2>&1 if [ $? -ne 0 ] then - echo "_check_fs: filesystem on $device is inconsistent (r) (see $seq.full)" + echo "_check_xfs_filesystem: filesystem on $device is inconsistent (r) (see $seq.full)" - echo "_check_fs: filesystem on $device is inconsistent" >>$here/$seq.full + echo "_check_xfs_filesystem: filesystem on $device is inconsistent" >>$here/$seq.full echo "*** xfs_repair -n output ***" >>$here/$seq.full cat $tmp.repair | _fix_malloc >>$here/$seq.full echo "*** end xfs_repair output" >>$here/$seq.full @@ -769,12 +757,24 @@ _check_xfs_filesystem() _check_udf_filesystem() { + [ "$DISABLE_UDF_TEST" == "1" ] && return + if [ $# -ne 1 -a $# -ne 2 ] then echo "Usage: _check_fs device [last_block]" 1>&2 exit 1 fi + if [ ! -x $here/src/udf_test ] + then + echo "udf_test not installed, please download and build the Philips" + echo "UDF Verification Software from http://www.extra.research.philips.com/udf/." + echo "Then copy the udf_test binary to $here/src/." + echo "If you do not wish to run udf_test then set environment variable DISABLE_UDF_TEST" + echo "to 1." + return + fi + device=$1 if [ $# -eq 2 ]; then -- 2.47.3