Install name of these scripts is in conflict with testcases/lib/test.sh. In problem Awais reported, he ended up with test.sh from fs-bench in install directory, instead of shell script library he was expecting: install -m 00775 "/root/ltp/testcases/lib/test.sh" "/opt/ltp/testcases/bin/test.sh" ... install -m 00775 "/root/ltp/testcases/kernel/fs/fs-bench/test.sh" "/opt/ltp/testcases/bin/test.sh"
Reported-by: Awais Belal <[email protected]> Signed-off-by: Jan Stancek <[email protected]> --- testcases/kernel/fs/fs-bench/Makefile | 2 +- testcases/kernel/fs/fs-bench/fs-bench-test.sh | 50 +++++++++++++++++++ testcases/kernel/fs/fs-bench/fs-bench-test2.sh | 63 ++++++++++++++++++++++++ testcases/kernel/fs/fs-bench/test.sh | 50 ------------------- testcases/kernel/fs/fs-bench/test2.sh | 63 ------------------------ 5 files changed, 114 insertions(+), 114 deletions(-) create mode 100755 testcases/kernel/fs/fs-bench/fs-bench-test.sh create mode 100755 testcases/kernel/fs/fs-bench/fs-bench-test2.sh delete mode 100755 testcases/kernel/fs/fs-bench/test.sh delete mode 100755 testcases/kernel/fs/fs-bench/test2.sh diff --git a/testcases/kernel/fs/fs-bench/Makefile b/testcases/kernel/fs/fs-bench/Makefile index c986184..8807ffc 100644 --- a/testcases/kernel/fs/fs-bench/Makefile +++ b/testcases/kernel/fs/fs-bench/Makefile @@ -24,7 +24,7 @@ top_srcdir ?= ../../../.. include $(top_srcdir)/include/mk/env_pre.mk -INSTALL_TARGETS := modaltr.sh test.sh test2.sh +INSTALL_TARGETS := modaltr.sh fs-bench-test.sh fs-bench-test2.sh LDLIBS += -lm diff --git a/testcases/kernel/fs/fs-bench/fs-bench-test.sh b/testcases/kernel/fs/fs-bench/fs-bench-test.sh new file mode 100755 index 0000000..c2ca767 --- /dev/null +++ b/testcases/kernel/fs/fs-bench/fs-bench-test.sh @@ -0,0 +1,50 @@ +#! /bin/bash + +echo "## Start Test" +date +if [ -d ./00 ] ; then + echo -n "Clear old files..." + /bin/rm -fr ./00 >& /dev/null + echo "done" +fi +STARTT=`date +%s` +echo $STARTT +echo "" +echo "## Create files " +time ~/fs-bench/cr + +echo "" +echo "## tar all " +MAXFILE=`tar cBf - 00 | tar tvBf - 2>&1 | tail -n 1 | awk '{print $6;}'| awk -F'/' '{print $4;}'` + +echo "" +echo "## Change owner" +time chown -R $USER ./00 + +echo "" +echo "## random access" +time ~/fs-bench/ra $MAXFILE + +echo "" +echo "## Change mode " +time chmod -R go+rw ./00 + +echo "" +echo "## Random delete and create" +time ~/fs-bench/radc $MAXFILE + +echo "" +echo "## Change mode again" +time chmod -R go-rw ./00 + +echo "" +echo "## Remove all files and directories" +time /bin/rm -fr ./00 +echo "" +echo "## Finish test" +ENDT=`date +%s` +echo $ENDT +date + +echo -n 'TOTAL(seconds): ' +expr $ENDT - $STARTT diff --git a/testcases/kernel/fs/fs-bench/fs-bench-test2.sh b/testcases/kernel/fs/fs-bench/fs-bench-test2.sh new file mode 100755 index 0000000..25c67af --- /dev/null +++ b/testcases/kernel/fs/fs-bench/fs-bench-test2.sh @@ -0,0 +1,63 @@ +#! /bin/bash + +echo "## Start Test" +date +date +%s +if [ -d ./00 ] ; then +/bin/rm -fr ./00 >& /dev/null +fi +STARTT=`date +%s` +echo $STARTT + +echo "" +echo "## Create files " +time ~/fs-bench/cr + +echo "" +echo "## tar all " +MAXFILE=`tar cBf - 00 | tar tvBf - 2>&1 | tail -n 1 | awk '{print $6;}'| awk -F'/' '{print $4;}'` +HALFFILE=`echo "obase=F;ibase=F;$MAXFILE/2" | bc` + +echo "" +echo "## Remove all files and directories" +/bin/rm -fr ./00 >& /dev/null + +echo "" +echo "## Create half files" +echo create half files +time ~/fs-bench/cr $HALFFILE + +echo "" +echo "## Change owner" +time chown -R $USER ./00 + +echo "" +echo "## random access" +time ~/fs-bench/ra $HALFFILE + + +echo "" +echo "## Change mode " +time chmod -R go+rw ./00 + +echo "" +echo "## Random delete and create" +time ~/fs-bench/radc $HALFFILE + +echo "" +echo "## Change mode again" +time chmod -R go-rw ./00 + +echo "" +echo "## Remove all files and directories" +time /bin/rm -fr ./00 + +echo "" +echo "## Finish test" +date +ENDT=`date +%s` +echo $ENDT +echo -n 'TOTAL(seconds): ' +expr $ENDT - $STARTT + + diff --git a/testcases/kernel/fs/fs-bench/test.sh b/testcases/kernel/fs/fs-bench/test.sh deleted file mode 100755 index c2ca767..0000000 --- a/testcases/kernel/fs/fs-bench/test.sh +++ /dev/null @@ -1,50 +0,0 @@ -#! /bin/bash - -echo "## Start Test" -date -if [ -d ./00 ] ; then - echo -n "Clear old files..." - /bin/rm -fr ./00 >& /dev/null - echo "done" -fi -STARTT=`date +%s` -echo $STARTT -echo "" -echo "## Create files " -time ~/fs-bench/cr - -echo "" -echo "## tar all " -MAXFILE=`tar cBf - 00 | tar tvBf - 2>&1 | tail -n 1 | awk '{print $6;}'| awk -F'/' '{print $4;}'` - -echo "" -echo "## Change owner" -time chown -R $USER ./00 - -echo "" -echo "## random access" -time ~/fs-bench/ra $MAXFILE - -echo "" -echo "## Change mode " -time chmod -R go+rw ./00 - -echo "" -echo "## Random delete and create" -time ~/fs-bench/radc $MAXFILE - -echo "" -echo "## Change mode again" -time chmod -R go-rw ./00 - -echo "" -echo "## Remove all files and directories" -time /bin/rm -fr ./00 -echo "" -echo "## Finish test" -ENDT=`date +%s` -echo $ENDT -date - -echo -n 'TOTAL(seconds): ' -expr $ENDT - $STARTT diff --git a/testcases/kernel/fs/fs-bench/test2.sh b/testcases/kernel/fs/fs-bench/test2.sh deleted file mode 100755 index 25c67af..0000000 --- a/testcases/kernel/fs/fs-bench/test2.sh +++ /dev/null @@ -1,63 +0,0 @@ -#! /bin/bash - -echo "## Start Test" -date -date +%s -if [ -d ./00 ] ; then -/bin/rm -fr ./00 >& /dev/null -fi -STARTT=`date +%s` -echo $STARTT - -echo "" -echo "## Create files " -time ~/fs-bench/cr - -echo "" -echo "## tar all " -MAXFILE=`tar cBf - 00 | tar tvBf - 2>&1 | tail -n 1 | awk '{print $6;}'| awk -F'/' '{print $4;}'` -HALFFILE=`echo "obase=F;ibase=F;$MAXFILE/2" | bc` - -echo "" -echo "## Remove all files and directories" -/bin/rm -fr ./00 >& /dev/null - -echo "" -echo "## Create half files" -echo create half files -time ~/fs-bench/cr $HALFFILE - -echo "" -echo "## Change owner" -time chown -R $USER ./00 - -echo "" -echo "## random access" -time ~/fs-bench/ra $HALFFILE - - -echo "" -echo "## Change mode " -time chmod -R go+rw ./00 - -echo "" -echo "## Random delete and create" -time ~/fs-bench/radc $HALFFILE - -echo "" -echo "## Change mode again" -time chmod -R go-rw ./00 - -echo "" -echo "## Remove all files and directories" -time /bin/rm -fr ./00 - -echo "" -echo "## Finish test" -date -ENDT=`date +%s` -echo $ENDT -echo -n 'TOTAL(seconds): ' -expr $ENDT - $STARTT - - -- 1.7.1 ------------------------------------------------------------------------------ Want fast and easy access to all the code in your enterprise? Index and search up to 200,000 lines of code with a free copy of Black Duck® Code Sight™ - the same software that powers the world's largest code search on Ohloh, the Black Duck Open Hub! Try it now. http://p.sf.net/sfu/bds _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
