| Message ID | 1484192182-13760-3-git-send-email-peterx@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Jan 12, 2017 at 11:36:21AM +0800, Peter Xu wrote: > We were using test.log before to keep all the test logs. This patch > creates one log file per test case under logs/ directory with name > "TESTNAME.log". Meanwhile, we will keep the last time log into > logs.old/. > > Renaming scripts/functions.bash into scripts/common.bash to store some > more global variables. > > Signed-off-by: Peter Xu <peterx@redhat.com> > --- > .gitignore | 3 ++- > Makefile | 5 ++--- > run_tests.sh | 19 ++++++++++++------- > scripts/{functions.bash => common.bash} | 13 +++++++++++-- > scripts/mkstandalone.sh | 2 +- > 5 files changed, 28 insertions(+), 14 deletions(-) > rename scripts/{functions.bash => common.bash} (75%) > > diff --git a/.gitignore b/.gitignore > index 3155418..2213b9b 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -12,7 +12,8 @@ cscope.* > /lib/asm > /config.mak > /*-run > -/test.log > /msr.out > /tests > /build-head > +/logs/ > +/logs.old/ > diff --git a/Makefile b/Makefile > index a32333b..844bacc 100644 > --- a/Makefile > +++ b/Makefile > @@ -94,9 +94,8 @@ libfdt_clean: > $(LIBFDT_objdir)/.*.d > > distclean: clean libfdt_clean > - $(RM) lib/asm config.mak $(TEST_DIR)-run test.log msr.out cscope.* \ > - build-head > - $(RM) -r tests > + $(RM) lib/asm config.mak $(TEST_DIR)-run msr.out cscope.* build-head > + $(RM) -r tests logs logs.old > > cscope: cscope_dirs = lib lib/libfdt lib/linux $(TEST_DIR) $(ARCH_LIBDIRS) lib/asm-generic > cscope: > diff --git a/run_tests.sh b/run_tests.sh > index 2cfa365..afd3d95 100755 > --- a/run_tests.sh > +++ b/run_tests.sh > @@ -7,7 +7,7 @@ if [ ! -f config.mak ]; then > exit 1 > fi > source config.mak > -source scripts/functions.bash > +source scripts/common.bash > > function usage() > { > @@ -46,17 +46,22 @@ while getopts "g:hv" opt; do > esac > done > > -RUNTIME_log_stderr () { cat >> test.log; } > +# RUNTIME_log_file will be configured later > +RUNTIME_log_stderr () { cat >> $RUNTIME_log_file; } > RUNTIME_log_stdout () { > if [ "$PRETTY_PRINT_STACKS" = "yes" ]; then > - ./scripts/pretty_print_stacks.py $1 >> test.log > + ./scripts/pretty_print_stacks.py $1 >> $RUNTIME_log_file > else > - cat >> test.log > + cat >> $RUNTIME_log_file > fi > } > > - > config=$TEST_DIR/unittests.cfg > -rm -f test.log > -printf "BUILD_HEAD=$(cat build-head)\n\n" > test.log > + > +rm -rf $unittest_log_dir.old > +[ -d $unittest_log_dir ] && mv $unittest_log_dir $unittest_log_dir.old > +mkdir $unittest_log_dir || exit 2 > + > +echo "BUILD_HEAD=$(cat build-head)" > $unittest_log_dir/SUMMARY > + nit: to be 100% correct all the references to the log dir should have "'s around them in order to handle spaces, or other shell ambiguous characters, in the name. For example, mkdir $log_dir, where $log_dir is "my tests" would create two directories, "my" and "tests" without the quotes. Anyway, I'm not too worried about someone choosing a weird log dir name, nor even changing it from the default. Isn't bash fun :-) > for_each_unittest $config run > diff --git a/scripts/functions.bash b/scripts/common.bash > similarity index 75% > rename from scripts/functions.bash > rename to scripts/common.bash > index ee9143c..2dd7360 100644 > --- a/scripts/functions.bash > +++ b/scripts/common.bash > @@ -1,3 +1,12 @@ > +: ${unittest_log_dir:=logs} > + > +function run_task() > +{ > + local testname="$2" > + > + RUNTIME_log_file="${unittest_log_dir}/${testname}.log" > + "$@" > +} > > function for_each_unittest() > { > @@ -17,7 +26,7 @@ function for_each_unittest() > > while read -u $fd line; do > if [[ "$line" =~ ^\[(.*)\]$ ]]; then > - "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" > + run_task "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" > testname=${BASH_REMATCH[1]} > smp=1 > kernel="" > @@ -45,6 +54,6 @@ function for_each_unittest() > timeout=${BASH_REMATCH[1]} > fi > done > - "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" > + run_task "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" > exec {fd}<&- > } > diff --git a/scripts/mkstandalone.sh b/scripts/mkstandalone.sh > index d2bae19..3c1938e 100755 > --- a/scripts/mkstandalone.sh > +++ b/scripts/mkstandalone.sh > @@ -5,7 +5,7 @@ if [ ! -f config.mak ]; then > exit 1 > fi > source config.mak > -source scripts/functions.bash > +source scripts/common.bash > > escape () > { > -- > 2.7.4 > > Reviewed-by: Andrew Jones <drjones@redhat.com>
On Thu, Jan 12, 2017 at 11:04:05AM +0100, Andrew Jones wrote: [...] > > config=$TEST_DIR/unittests.cfg > > -rm -f test.log > > -printf "BUILD_HEAD=$(cat build-head)\n\n" > test.log > > + > > +rm -rf $unittest_log_dir.old > > +[ -d $unittest_log_dir ] && mv $unittest_log_dir $unittest_log_dir.old > > +mkdir $unittest_log_dir || exit 2 > > + > > +echo "BUILD_HEAD=$(cat build-head)" > $unittest_log_dir/SUMMARY > > + > > nit: to be 100% correct all the references to the log dir should have > "'s around them in order to handle spaces, or other shell ambiguous > characters, in the name. For example, mkdir $log_dir, where $log_dir > is "my tests" would create two directories, "my" and "tests" without > the quotes. Anyway, I'm not too worried about someone choosing a > weird log dir name, nor even changing it from the default. > > Isn't bash fun :-) It is, as long as it won't break my system... (Once I accidentally did a "rm -rf /lib" in Bash when I was still using FreeBSD... Bash became less funny since then ;-). I'll add them if I'm going to have another spin. [...] > Reviewed-by: Andrew Jones <drjones@redhat.com> Thanks for reviewing! -- peterx
On 12/01/2017 04:36, Peter Xu wrote: > We were using test.log before to keep all the test logs. This patch > creates one log file per test case under logs/ directory with name > "TESTNAME.log". Meanwhile, we will keep the last time log into > logs.old/. > > Renaming scripts/functions.bash into scripts/common.bash to store some > more global variables. > > Signed-off-by: Peter Xu <peterx@redhat.com> > --- > .gitignore | 3 ++- > Makefile | 5 ++--- > run_tests.sh | 19 ++++++++++++------- > scripts/{functions.bash => common.bash} | 13 +++++++++++-- > scripts/mkstandalone.sh | 2 +- > 5 files changed, 28 insertions(+), 14 deletions(-) > rename scripts/{functions.bash => common.bash} (75%) > > diff --git a/.gitignore b/.gitignore > index 3155418..2213b9b 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -12,7 +12,8 @@ cscope.* > /lib/asm > /config.mak > /*-run > -/test.log > /msr.out > /tests > /build-head > +/logs/ > +/logs.old/ > diff --git a/Makefile b/Makefile > index a32333b..844bacc 100644 > --- a/Makefile > +++ b/Makefile > @@ -94,9 +94,8 @@ libfdt_clean: > $(LIBFDT_objdir)/.*.d > > distclean: clean libfdt_clean > - $(RM) lib/asm config.mak $(TEST_DIR)-run test.log msr.out cscope.* \ > - build-head > - $(RM) -r tests > + $(RM) lib/asm config.mak $(TEST_DIR)-run msr.out cscope.* build-head > + $(RM) -r tests logs logs.old > > cscope: cscope_dirs = lib lib/libfdt lib/linux $(TEST_DIR) $(ARCH_LIBDIRS) lib/asm-generic > cscope: > diff --git a/run_tests.sh b/run_tests.sh > index 2cfa365..afd3d95 100755 > --- a/run_tests.sh > +++ b/run_tests.sh > @@ -7,7 +7,7 @@ if [ ! -f config.mak ]; then > exit 1 > fi > source config.mak > -source scripts/functions.bash > +source scripts/common.bash > > function usage() > { > @@ -46,17 +46,22 @@ while getopts "g:hv" opt; do > esac > done > > -RUNTIME_log_stderr () { cat >> test.log; } > +# RUNTIME_log_file will be configured later > +RUNTIME_log_stderr () { cat >> $RUNTIME_log_file; } > RUNTIME_log_stdout () { > if [ "$PRETTY_PRINT_STACKS" = "yes" ]; then > - ./scripts/pretty_print_stacks.py $1 >> test.log > + ./scripts/pretty_print_stacks.py $1 >> $RUNTIME_log_file > else > - cat >> test.log > + cat >> $RUNTIME_log_file > fi > } > > - > config=$TEST_DIR/unittests.cfg > -rm -f test.log > -printf "BUILD_HEAD=$(cat build-head)\n\n" > test.log > + > +rm -rf $unittest_log_dir.old > +[ -d $unittest_log_dir ] && mv $unittest_log_dir $unittest_log_dir.old > +mkdir $unittest_log_dir || exit 2 > + > +echo "BUILD_HEAD=$(cat build-head)" > $unittest_log_dir/SUMMARY > + > for_each_unittest $config run > diff --git a/scripts/functions.bash b/scripts/common.bash > similarity index 75% > rename from scripts/functions.bash > rename to scripts/common.bash > index ee9143c..2dd7360 100644 > --- a/scripts/functions.bash > +++ b/scripts/common.bash > @@ -1,3 +1,12 @@ > +: ${unittest_log_dir:=logs} > + > +function run_task() > +{ > + local testname="$2" > + > + RUNTIME_log_file="${unittest_log_dir}/${testname}.log" > + "$@" > +} This should go in run_tests.sh since that's the only place that uses unittest_log_dir. (The last line then becomes 'run "$@"' and the for_each_unittest call must be adjusted). Done and queued. Paolo > function for_each_unittest() > { > @@ -17,7 +26,7 @@ function for_each_unittest() > > while read -u $fd line; do > if [[ "$line" =~ ^\[(.*)\]$ ]]; then > - "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" > + run_task "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" > testname=${BASH_REMATCH[1]} > smp=1 > kernel="" > @@ -45,6 +54,6 @@ function for_each_unittest() > timeout=${BASH_REMATCH[1]} > fi > done > - "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" > + run_task "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" > exec {fd}<&- > } > diff --git a/scripts/mkstandalone.sh b/scripts/mkstandalone.sh > index d2bae19..3c1938e 100755 > --- a/scripts/mkstandalone.sh > +++ b/scripts/mkstandalone.sh > @@ -5,7 +5,7 @@ if [ ! -f config.mak ]; then > exit 1 > fi > source config.mak > -source scripts/functions.bash > +source scripts/common.bash > > escape () > { >
On Thu, Jan 12, 2017 at 01:55:48PM +0100, Paolo Bonzini wrote: [...] > > diff --git a/scripts/functions.bash b/scripts/common.bash > > similarity index 75% > > rename from scripts/functions.bash > > rename to scripts/common.bash > > index ee9143c..2dd7360 100644 > > --- a/scripts/functions.bash > > +++ b/scripts/common.bash > > @@ -1,3 +1,12 @@ > > +: ${unittest_log_dir:=logs} > > + > > +function run_task() > > +{ > > + local testname="$2" > > + > > + RUNTIME_log_file="${unittest_log_dir}/${testname}.log" > > + "$@" > > +} > > This should go in run_tests.sh since that's the only place that uses > unittest_log_dir. (The last line then becomes 'run "$@"' and the > for_each_unittest call must be adjusted). Done and queued. Yes, this should be cleaner. Thanks, -- peterx
diff --git a/.gitignore b/.gitignore index 3155418..2213b9b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,8 @@ cscope.* /lib/asm /config.mak /*-run -/test.log /msr.out /tests /build-head +/logs/ +/logs.old/ diff --git a/Makefile b/Makefile index a32333b..844bacc 100644 --- a/Makefile +++ b/Makefile @@ -94,9 +94,8 @@ libfdt_clean: $(LIBFDT_objdir)/.*.d distclean: clean libfdt_clean - $(RM) lib/asm config.mak $(TEST_DIR)-run test.log msr.out cscope.* \ - build-head - $(RM) -r tests + $(RM) lib/asm config.mak $(TEST_DIR)-run msr.out cscope.* build-head + $(RM) -r tests logs logs.old cscope: cscope_dirs = lib lib/libfdt lib/linux $(TEST_DIR) $(ARCH_LIBDIRS) lib/asm-generic cscope: diff --git a/run_tests.sh b/run_tests.sh index 2cfa365..afd3d95 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -7,7 +7,7 @@ if [ ! -f config.mak ]; then exit 1 fi source config.mak -source scripts/functions.bash +source scripts/common.bash function usage() { @@ -46,17 +46,22 @@ while getopts "g:hv" opt; do esac done -RUNTIME_log_stderr () { cat >> test.log; } +# RUNTIME_log_file will be configured later +RUNTIME_log_stderr () { cat >> $RUNTIME_log_file; } RUNTIME_log_stdout () { if [ "$PRETTY_PRINT_STACKS" = "yes" ]; then - ./scripts/pretty_print_stacks.py $1 >> test.log + ./scripts/pretty_print_stacks.py $1 >> $RUNTIME_log_file else - cat >> test.log + cat >> $RUNTIME_log_file fi } - config=$TEST_DIR/unittests.cfg -rm -f test.log -printf "BUILD_HEAD=$(cat build-head)\n\n" > test.log + +rm -rf $unittest_log_dir.old +[ -d $unittest_log_dir ] && mv $unittest_log_dir $unittest_log_dir.old +mkdir $unittest_log_dir || exit 2 + +echo "BUILD_HEAD=$(cat build-head)" > $unittest_log_dir/SUMMARY + for_each_unittest $config run diff --git a/scripts/functions.bash b/scripts/common.bash similarity index 75% rename from scripts/functions.bash rename to scripts/common.bash index ee9143c..2dd7360 100644 --- a/scripts/functions.bash +++ b/scripts/common.bash @@ -1,3 +1,12 @@ +: ${unittest_log_dir:=logs} + +function run_task() +{ + local testname="$2" + + RUNTIME_log_file="${unittest_log_dir}/${testname}.log" + "$@" +} function for_each_unittest() { @@ -17,7 +26,7 @@ function for_each_unittest() while read -u $fd line; do if [[ "$line" =~ ^\[(.*)\]$ ]]; then - "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" + run_task "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" testname=${BASH_REMATCH[1]} smp=1 kernel="" @@ -45,6 +54,6 @@ function for_each_unittest() timeout=${BASH_REMATCH[1]} fi done - "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" + run_task "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" exec {fd}<&- } diff --git a/scripts/mkstandalone.sh b/scripts/mkstandalone.sh index d2bae19..3c1938e 100755 --- a/scripts/mkstandalone.sh +++ b/scripts/mkstandalone.sh @@ -5,7 +5,7 @@ if [ ! -f config.mak ]; then exit 1 fi source config.mak -source scripts/functions.bash +source scripts/common.bash escape () {
We were using test.log before to keep all the test logs. This patch creates one log file per test case under logs/ directory with name "TESTNAME.log". Meanwhile, we will keep the last time log into logs.old/. Renaming scripts/functions.bash into scripts/common.bash to store some more global variables. Signed-off-by: Peter Xu <peterx@redhat.com> --- .gitignore | 3 ++- Makefile | 5 ++--- run_tests.sh | 19 ++++++++++++------- scripts/{functions.bash => common.bash} | 13 +++++++++++-- scripts/mkstandalone.sh | 2 +- 5 files changed, 28 insertions(+), 14 deletions(-) rename scripts/{functions.bash => common.bash} (75%)