From a99fd329558a984f0be2bb9b331997dbdf9c0a59 Mon Sep 17 00:00:00 2001 From: Brandon Simmons Date: Thu, 15 Apr 2021 09:47:47 -0400 Subject: [PATCH] =?UTF-8?q?dev.sh:=20fix=20hpc=20after=20switch=20to=20dyn?= =?UTF-8?q?amic=20executable=20for=20local=20dev,=20in=20=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GitOrigin-RevId: b31e5c839f3277f99a11208d315e756ddaf46ca6 --- scripts/dev.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/dev.sh b/scripts/dev.sh index 9c75523b670..949639769d0 100755 --- a/scripts/dev.sh +++ b/scripts/dev.sh @@ -218,7 +218,7 @@ if [ "$MODE" = "graphql-engine" ]; then # works when cabal.project.dev-sh.local is edited to turn on optimizations. # See also: https://hackage.haskell.org/package/cabal-plan distdir=$(cat dist-newstyle/cache/plan.json | jq -r '."install-plan"[] | select(."id" == "graphql-engine-1.0.0-inplace")? | ."dist-dir"') - hpcdir="$distdir/hpc/vanilla/mix/graphql-engine-1.0.0" + hpcdir="$distdir/hpc/dyn/mix/graphql-engine-1.0.0" echo_pretty "Generating code coverage report..." COVERAGE_DIR="dist-newstyle/dev.sh-coverage" hpc_invocation=(hpc markup @@ -526,15 +526,15 @@ elif [ "$MODE" = "test" ]; then COVERAGE_DIR="dist-newstyle/dev.sh-coverage" hpc markup \ --exclude=Main \ - --hpcdir dist-newstyle/build/*/ghc-*/graphql-engine-*/noopt/hpc/vanilla/mix/graphql-engine-* \ - --hpcdir dist-newstyle/build/*/ghc-*/graphql-engine-*/t/graphql-engine-tests/noopt/hpc/vanilla/mix/graphql-engine-tests \ + --hpcdir dist-newstyle/build/*/ghc-*/graphql-engine-*/noopt/hpc/dyn/mix/graphql-engine-* \ + --hpcdir dist-newstyle/build/*/ghc-*/graphql-engine-*/t/graphql-engine-tests/noopt/hpc/dyn/mix/graphql-engine-tests \ --reset-hpcdirs graphql-engine-combined.tix \ --fun-entry-count \ --destdir="$COVERAGE_DIR" >/dev/null hpc report \ --exclude=Main \ - --hpcdir dist-newstyle/build/*/ghc-*/graphql-engine-*/noopt/hpc/vanilla/mix/graphql-engine-* \ - --hpcdir dist-newstyle/build/*/ghc-*/graphql-engine-*/t/graphql-engine-tests/noopt/hpc/vanilla/mix/graphql-engine-tests \ + --hpcdir dist-newstyle/build/*/ghc-*/graphql-engine-*/noopt/hpc/dyn/mix/graphql-engine-* \ + --hpcdir dist-newstyle/build/*/ghc-*/graphql-engine-*/t/graphql-engine-tests/noopt/hpc/dyn/mix/graphql-engine-tests \ --reset-hpcdirs graphql-engine-combined.tix echo_pretty "To view full coverage report open:" echo_pretty " file://$(pwd)/$COVERAGE_DIR/hpc_index.html"