fstests: use _require_symlinks on all necessary tests

[xfstests-dev.git] / tests / generic / 294

diff --git a/tests/generic/294 b/tests/generic/294
old mode 100644 (file)
new mode 100755 (executable)
index 3433c9b..32c89b0
--- a/tests/generic/294
+++ b/tests/generic/294
@@ -1,28 +1,14 @@
 #! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2012 Red Hat, Inc.  All Rights Reserved.
+#
 # FS QA Test No. 294
 #
 # Tests for EEXIST (not EROFS) for inode creations, if
 # we ask to create an already-existing entity on an RO filesystem
 #
-#-----------------------------------------------------------------------
-# Copyright (c) 2012 Red Hat, 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.
-#
-# 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.  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 the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#-----------------------------------------------------------------------
-#
-
 seq=`basename $0`
+seqres=$RESULT_DIR/$seq
 echo "QA output created by $seq"
 
 here=`pwd`
@@ -37,8 +23,8 @@ _cleanup()
 }
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 # real QA test starts here
 
@@ -46,12 +32,16 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_symlinks
+
+rm -f $seqres.full
+_scratch_mkfs > $seqres.full 2>&1 || _fail "Could not mkfs scratch device"
 
 THIS_TEST_DIR=$SCRATCH_MNT/$seq.test
 
 _create_files()
 {
-       mknod $THIS_TEST_DIR/testnode c 1 3
+       mknod $THIS_TEST_DIR/testnode c 1 3 2>&1 | _filter_mknod
        mkdir $THIS_TEST_DIR/testdir
        touch $THIS_TEST_DIR/testtarget
        ln -s $THIS_TEST_DIR/testtarget $THIS_TEST_DIR/testlink 2>&1 | _filter_ln
@@ -63,7 +53,7 @@ rm -rf $THIS_TEST_DIR
 mkdir $THIS_TEST_DIR || _fail "Could not create dir for test"
 
 _create_files 2>&1 | _filter_scratch
-_scratch_mount -o remount,ro || _fail "Could not remount scratch readonly"
+_try_scratch_mount -o remount,ro || _fail "Could not remount scratch readonly"
 _create_files 2>&1 | _filter_scratch
 
 # success, all done