@@ -378,13 +378,19 @@ function torture_set {
378
378
then
379
379
curflavor=$flavor
380
380
torture_one " $@ "
381
- mv $T /last-resdir $T /last-resdir-nodebug || :
381
+ if test -e $T /last-resdir
382
+ then
383
+ mv $T /last-resdir $T /last-resdir-nodebug || :
384
+ fi
382
385
fi
383
386
if test " $do_kasan " = " yes"
384
387
then
385
388
curflavor=${flavor} -kasan
386
389
torture_one " $@ " --kasan
387
- mv $T /last-resdir $T /last-resdir-kasan || :
390
+ if test -e $T /last-resdir
391
+ then
392
+ mv $T /last-resdir $T /last-resdir-kasan || :
393
+ fi
388
394
fi
389
395
if test " $do_kcsan " = " yes"
390
396
then
@@ -400,7 +406,10 @@ function torture_set {
400
406
chk_rdr_state=" CONFIG_RCU_TORTURE_TEST_CHK_RDR_STATE=y"
401
407
fi
402
408
torture_one " $@ " --kconfig " CONFIG_DEBUG_LOCK_ALLOC=y CONFIG_PROVE_LOCKING=y ${kcsan_expert} ${chk_rdr_state} " $kcsan_kmake_tag $cur_kcsan_kmake_args --kcsan
403
- mv $T /last-resdir $T /last-resdir-kcsan || :
409
+ if test -e $T /last-resdir
410
+ then
411
+ mv $T /last-resdir $T /last-resdir-kcsan || :
412
+ fi
404
413
fi
405
414
}
406
415
@@ -704,7 +713,14 @@ nfailures=0
704
713
echo FAILURES: | tee -a $T /log
705
714
if test -s " $T /failures"
706
715
then
707
- awk < " $T /failures" -v sq=" '" ' { print "echo " sq $0 sq; print "sed -e " sq "1,/^ --- .* Test summary:$/d" sq " " $2 "/log | grep Summary: | sed -e " sq "s/^[^S]*/ /" sq; }' | sh | tee -a $T /log | tee " $T /failuresum"
716
+ awk < " $T /failures" -v sq=" '" '
717
+ {
718
+ print "echo " sq $0 sq;
719
+ if ($2 != "")
720
+ print "sed -e " sq "1,/^ --- .* Test summary:$/d" sq " " $2 "/log | grep Summary: | sed -e " sq "s/^[^S]*/ /" sq;
721
+ else
722
+ print "echo " sq " " sq "Run failed to produce results directory.";
723
+ }' | sh | tee -a $T /log | tee " $T /failuresum"
708
724
nfailures=" ` wc -l " $T /failures" | awk ' { print $1 }' ` "
709
725
grep " ^ Summary: " " $T /failuresum" |
710
726
grep -v ' ^ Summary: Bugs: [0-9]* (all bugs kcsan)$' > " $T /nonkcsan"
@@ -714,13 +730,13 @@ then
714
730
fi
715
731
ret=2
716
732
fi
717
- if test " $do_kcsan " = " yes"
733
+ if test " $do_kcsan " = " yes" && test -e tools/testing/selftests/rcutorture/res/ $ds
718
734
then
719
735
TORTURE_KCONFIG_KCSAN_ARG=1 tools/testing/selftests/rcutorture/bin/kcsan-collapse.sh tools/testing/selftests/rcutorture/res/$ds > tools/testing/selftests/rcutorture/res/$ds /kcsan.sum
720
736
fi
721
737
echo Started at $startdate , ended at ` date` , duration ` get_starttime_duration $starttime ` . | tee -a $T /log
722
738
echo Summary: Successes: $nsuccesses Failures: $nfailures . | tee -a $T /log
723
- tdir=" ` cat $T /successes $T /failures | head -1 | awk ' { print $NF }' | sed -e ' s,/[^/]\+/*$,,' ` "
739
+ tdir=" ` cat $T /successes $T /failures | awk ' NF > 1 { print $NF }' | head -1 | sed -e ' s,/[^/]\+/*$,,' ` "
724
740
if test -n " $tdir "
725
741
then
726
742
find " $tdir " -name ' ConfigFragment.diags' -print > $T /configerrors
0 commit comments