lkml.org 
[lkml]   [2017]   [Apr]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [RFC][PATCH] selftests: ftrace: Allow some tests to be run in a tracing instance
On Fri, 21 Apr 2017 18:36:17 +0900
Masami Hiramatsu <mhiramat@kernel.org> wrote:

> On Thu, 20 Apr 2017 13:30:34 -0400
> Steven Rostedt <rostedt@goodmis.org> wrote:
> >
> > An tracing instance has several of the same capabilities as the top level
> > instance, but may be implemented slightly different. Instead of just writing
> > tests that duplicat the same test cases of the top level instance, allow a
> > test to be written for both the top level as well as for an instance.
> >
> > If a test case can be run in both the top level as well as in an tracing
> > instance directory, then it should have a ".itc" extension instead of just
> > the ".tc" extension.
>
> Hm, I'd rather like to have a tag for each script instead of
> using the extension. E.g.
>
> #!/bin/sh
> # description: Kprobe dynamic event - busy event check
> # test: instance

BTW, I also have some comments, see below,

[...]
> > +INSTANCE_DIR="."
> > __run_test() { # testfile
> > # setup PID and PPID, $$ is not updated.
> > - (cd $TRACING_DIR; read PID _ < /proc/self/stat; set -e; set -x; initialize_ftrace; . $1)
> > + (cd $TRACING_DIR; read PID _ < /proc/self/stat; set -e; set -x; initialize_ftrace; cd $INSTANCE_DIR; . $1)

You can just change "cd $TRACING_DIR;" with "cd $TRACING_DIR/$INSTANCE_DIR;"
Then, the default value of INSTANCE_DIR can be "".

> > [ $? -ne 0 ] && kill -s $SIG_FAIL $SIG_PID
> > }
> >
> > # Run one test case
> > -run_test() { # testfile
> > +run_test() { # [-i] testfile
> > + local makeinstance=0
> > + if [ $1 == "-i" ]; then
> > + makeinstance=1
> > + shift
> > + fi

No, don't parse argument in the function. You can just define
MAKEINSTANCE=1 global variable before calling this.

> > local testname=`basename $1`
> > local testlog=`mktemp $LOG_DIR/${testname}-log.XXXXXX`
> > export TMPDIR=`mktemp -d /tmp/ftracetest-dir.XXXXXX`
> > testcase $1

Anyway, if we use a "tag" in the script header, we can get it
in this testcase() and update TEST_TAGS global variable there.

> > + if [ $makeinstance -eq 1 ]; then

and check whether "instance" tag in $TEST_TAGS here.

> > + INSTANCE_DIR=$TRACING_DIR/instances/${testname}_test
> > + mkdir $INSTANCE_DIR
> > + fi


> > echo "execute: "$1 > $testlog
> > SIG_RESULT=0
> > if [ $VERBOSE -ge 2 ]; then
> > @@ -260,17 +274,36 @@ run_test() { # testfile
> > [ $VERBOSE -ge 1 ] && catlog $testlog
> > TOTAL_RESULT=1
> > fi
> > + if [ $makeinstance -eq 1 ]; then

Here also we can just check the "$INSTANCE_DIR" is not empty.

Thank you,

> > + rmdir $INSTANCE_DIR
> > + INSTANCE_DIR="."
> > + fi
> > rm -rf $TMPDIR
> > }
> >
> > # load in the helper functions
> > . $TEST_DIR/functions
> >
> > +RUN_INSTANCES=0
> > +
> > # Main loop
> > for t in $TEST_CASES; do
> > + if [ "${t/*./}" == "itc" ]; then
> > + RUN_INSTANCES=1
> > + fi
> > run_test $t
> > done
> >
> > +if [ $RUN_INSTANCES -eq 1 ]; then
> > + echo "Running tests in an tracing instance:"
> > + for t in $TEST_CASES; do
> > + if [ "${t/*./}" != "itc" ]; then
> > + continue
> > + fi
> > + run_test -i $t
> > + done
> > +fi
> > +
> > prlog ""
> > prlog "# of passed: " `echo $PASSED_CASES | wc -w`
> > prlog "# of failed: " `echo $FAILED_CASES | wc -w`
> > --
> > 2.9.3
> >
>
>
> --
> Masami Hiramatsu <mhiramat@kernel.org>


--
Masami Hiramatsu <mhiramat@kernel.org>

\
 
 \ /
  Last update: 2017-04-21 12:00    [W:0.072 / U:47.540 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site