From dfa73e77b58ef8bf20b6138f63234169b39a8d60 Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Wed, 4 Mar 2020 16:54:51 +0100 Subject: [PATCH] autotest.sh: save lcov files in output_dir Coverage and ut_coverage files would get created in spdk dir or in directory from which the autotest.sh was called. Use $output_dir provided by autotest_common.sh instead to keep all build artifacts in common place. Signed-off-by: Karol Latecki Change-Id: Iaf009182441933cb5e9bd137d0c94078272dd749 Signed-off-by: Karol Latecki Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1134 Reviewed-by: Maciej Wawryk Reviewed-by: Darek Stojaczyk Reviewed-by: Tomasz Zawadzki Tested-by: SPDK CI Jenkins --- autotest.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/autotest.sh b/autotest.sh index 74a357e69..23b678d20 100755 --- a/autotest.sh +++ b/autotest.sh @@ -34,7 +34,7 @@ timing_enter autotest create_test_list src=$(readlink -f $(dirname $0)) -out=$PWD +out=$output_dir cd $src ./scripts/setup.sh status @@ -56,7 +56,7 @@ if hash lcov; then # Print lcov version to log $LCOV -v # zero out coverage data - $LCOV -q -c -i -t "Baseline" -d $src -o cov_base.info + $LCOV -q -c -i -t "Baseline" -d $src -o $out/cov_base.info fi # Make sure the disks are clean (no leftover partition tables) @@ -309,8 +309,8 @@ process_core if hash lcov; then # generate coverage data and combine with baseline - $LCOV -q -c -d $src -t "$(hostname)" -o cov_test.info - $LCOV -q -a cov_base.info -a cov_test.info -o $out/cov_total.info + $LCOV -q -c -d $src -t "$(hostname)" -o $out/cov_test.info + $LCOV -q -a $out/cov_base.info -a $out/cov_test.info -o $out/cov_total.info $LCOV -q -r $out/cov_total.info '*/dpdk/*' -o $out/cov_total.info $LCOV -q -r $out/cov_total.info '/usr/*' -o $out/cov_total.info git clean -f "*.gcda"