From f2b2aa4154dd8b9440978bbaa4599f360c973d6d Mon Sep 17 00:00:00 2001 From: Harendra Kumar Date: Tue, 15 Jun 2021 16:22:49 +0530 Subject: [PATCH] Refactor coverage report code --- bin/test.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/test.sh b/bin/test.sh index a6348927e..023842c5c 100755 --- a/bin/test.sh +++ b/bin/test.sh @@ -154,6 +154,10 @@ fi # Run coverage reports #----------------------------------------------------------------------------- +PACKAGE_NAME=streamly-0.7.2 +MIX_DIR=$BUILD_DIR/build/$SYSTEM/ghc-${GHC_VERSION}/$PACKAGE_NAME/hpc/vanilla/mix/$PACKAGE_NAME/ +ALLTIX=$BUILD_DIR/hpc/all.tix + if test "$COVERAGE" -eq "1" -a "$RAW" -eq 0 then TIXFILES= @@ -166,10 +170,7 @@ then fi done - ALLTIX=$BUILD_DIR/hpc/all.tix hpc sum --output=$ALLTIX $TIXFILES - run_verbose hpc markup $ALLTIX --hpcdir \ - $BUILD_DIR/build/$SYSTEM/ghc-${GHC_VERSION}/streamly-0.7.2/hpc/vanilla/mix/streamly-0.7.2/ - run_verbose hpc report $ALLTIX $HPC_REPORT_OPTIONS --hpcdir \ - $BUILD_DIR/build/$SYSTEM/ghc-${GHC_VERSION}/streamly-0.7.2/hpc/vanilla/mix/streamly-0.7.2/ + run_verbose hpc markup $ALLTIX --hpcdir $MIX_DIR + run_verbose hpc report $ALLTIX $HPC_REPORT_OPTIONS --hpcdir $MIX_DIR fi