Message ID | 20231030110107.4528-3-andrea.cervesato@suse.de |
---|---|
State | Accepted |
Headers | show |
Series | Rewrite fsx-linux | expand |
Hi Andrea, > +++ b/doc/ltp-run-files.txt ... Andrea, if there is v3 needed, please rebase (this file was removed, thus one must adjust the patch in order to apply it). Kind regards, Petr > @@ -41,7 +41,6 @@ Test suites > - syscalls (except epoll, see below) > - fs > - - fsx > - dio > - mm > - ipc
Hi Andrea,
runltp also has fsx part, which needs to be deleted:
# The fsx-linux tests use the SCRATCHDEV environment variable as a location
# that can be reformatted and run on. Set SCRATCHDEV if you want to run
# these tests. As a safeguard, this is disabled.
unset SCRATCHDEV
[ -n "$SCRATCHDEV" ] && \
{
cat ${LTPROOT}/runtest/fsx >> ${TMP}/alltests ||
{
echo "FATAL: unable to create fsx-linux tests command file"
exit 1
}
}
With that removed, you can add:
Reviewed-by: Petr Vorel <pvorel@suse.cz>
BTW I also wonder if we still need testscripts/ltp-aiodio.sh.
Kind regards,
Petr
Hi Andrea, Cyril, I merged the patchset with moving Makefile change to the second commit, where it belongs. Thanks! > Hi Andrea, > runltp also has fsx part, which needs to be deleted: > # The fsx-linux tests use the SCRATCHDEV environment variable as a location > # that can be reformatted and run on. Set SCRATCHDEV if you want to run > # these tests. As a safeguard, this is disabled. > unset SCRATCHDEV > [ -n "$SCRATCHDEV" ] && \ > { > cat ${LTPROOT}/runtest/fsx >> ${TMP}/alltests || > { > echo "FATAL: unable to create fsx-linux tests command file" > exit 1 > } > } I merged this as a separate commit. > With that removed, you can add: > Reviewed-by: Petr Vorel <pvorel@suse.cz> > BTW I also wonder if we still need testscripts/ltp-aiodio.sh. This is still open question. Kind regards, Petr > Kind regards, > Petr
Thank you! This is a really good news. Andrea On 11/28/23 19:26, Petr Vorel wrote: > Hi Andrea, Cyril, > > I merged the patchset with moving Makefile change to the second commit, > where it belongs. > > Thanks! > >> Hi Andrea, >> runltp also has fsx part, which needs to be deleted: >> # The fsx-linux tests use the SCRATCHDEV environment variable as a location >> # that can be reformatted and run on. Set SCRATCHDEV if you want to run >> # these tests. As a safeguard, this is disabled. >> unset SCRATCHDEV >> [ -n "$SCRATCHDEV" ] && \ >> { >> cat ${LTPROOT}/runtest/fsx >> ${TMP}/alltests || >> { >> echo "FATAL: unable to create fsx-linux tests command file" >> exit 1 >> } >> } > I merged this as a separate commit. > >> With that removed, you can add: >> Reviewed-by: Petr Vorel <pvorel@suse.cz> >> BTW I also wonder if we still need testscripts/ltp-aiodio.sh. > This is still open question. > > Kind regards, > Petr > >> Kind regards, >> Petr
diff --git a/doc/ltp-run-files.txt b/doc/ltp-run-files.txt index 3f405b387..8b3ed78fd 100644 --- a/doc/ltp-run-files.txt +++ b/doc/ltp-run-files.txt @@ -41,7 +41,6 @@ Test suites - syscalls (except epoll, see below) - fs - - fsx - dio - mm - ipc diff --git a/runtest/fsx b/runtest/fsx deleted file mode 100644 index b09e5c2af..000000000 --- a/runtest/fsx +++ /dev/null @@ -1,8 +0,0 @@ -#DESCRIPTION:fsx filesystem stress tests -fsx-linux export TCbin=$LTPROOT/testcases/bin;fsxtest02 10000 -#fsx-ext2 fsxtest $SCRATCHDEV ext2 10000 -#fsx-ext3 fsxtest $SCRATCHDEV ext3 10000 -#fsx-jfs fsxtest $SCRATCHDEV jfs 10000 -#fsx-xfs fsxtest $SCRATCHDEV xfs 10000 -#fsx-reiserfs fsxtest $SCRATCHDEV reiserfs 10000 - diff --git a/scenario_groups/default b/scenario_groups/default index 68bd5300d..f17b2061a 100644 --- a/scenario_groups/default +++ b/scenario_groups/default @@ -1,7 +1,6 @@ syscalls fs fs_perms_simple -fsx dio io mm diff --git a/testcases/kernel/fs/fsx-linux/fsxtest b/testcases/kernel/fs/fsx-linux/fsxtest deleted file mode 100755 index 61835437d..000000000 --- a/testcases/kernel/fs/fsx-linux/fsxtest +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2001 Silicon Graphics, Inc. All Rights Reserved. -# Copyright (c) International Business Machines Corp., 2001 -# -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# -# -# Proper error checking and result reporting still needed -# -# usage: fsxtest $1 $2 $3 -# $1 scratch device to use for testing -# $2 optional file system type -# $3 number of operations to perform - -#Uncomment line below for debugging -#set -x -if [ $2 = "jfs" ]; then - mkfs -t $2 -q $1 -else - mkfs -t $2 $1 -fi -mkdir /testmount -mount -t $2 $1 /testmount -touch /testmount/testfile -fsx-linux -N $3 /testmount/testfile -RESULT=$? -# report the results -if [ $RESULT -eq "0" ]; then - echo "PASS: fsxtest $1 $2 $3" -else - echo "FAIL: fsxtest $1 $2 $3" -fi -umount /testmount -rm -rf /testmount -fsck -a -t $2 $1 # report the results -exit $RESULT diff --git a/testcases/kernel/fs/fsx-linux/fsxtest02 b/testcases/kernel/fs/fsx-linux/fsxtest02 deleted file mode 100755 index fe014abdd..000000000 --- a/testcases/kernel/fs/fsx-linux/fsxtest02 +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2001 Silicon Graphics, Inc. All Rights Reserved. -# Copyright (c) International Business Machines Corp., 2001 -# -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# -# -# Proper error checking and result reporting still needed -# -# usage: fsxtest02 $1 -# $1 number of operations to perform - -#Uncomment line below for debugging -#set -x - -TCbin=${TCbin:-`pwd`} -TCtmp=${TCtmp:-/tmp/fsxtest2.$$} - -mkdir -p $TCtmp 2>/dev/null -touch $TCtmp/testfile -$TCbin/fsx-linux -N $1 $TCtmp/testfile -RESULT=$? -# report the results -if [ $RESULT -eq "0" ]; then - echo "PASS: fsxtest02 $1 $2 $3" -else - echo "FAIL: fsxtest02 $1 $2 $3" -fi -rm -rf $TCtmp -exit $RESULT