6fd821c · streamly · git.iko.soy

git.iko.soy/streamly

on master help sign in

fix cabal not finding benchmark executables

6fd821cHarendra Kumar7 years ago

bench.sh+9−1

@@ -248,6 +248,12 @@ GAUGE_ARGS=

248BUILD_ONCE=0

249USE_STACK=0

250

251+GHC_VERSION=$(ghc --numeric-version)

252+

253+cabal_which() {

254+ find dist-newstyle -type f -path "*${GHC_VERSION}*/$1"

255+}

256+

251if test "$USE_STACK" = "1"

257if test "$USE_STACK" = "1"

252then

258then

253 WHICH_COMMAND="stack exec which"

259 WHICH_COMMAND="stack exec which"

@@ -255,7 +261,9 @@ then

255 GET_BENCH_PROG=stack_bench_prog

261 GET_BENCH_PROG=stack_bench_prog

256 BUILD_BENCH="stack build $STACK_BUILD_FLAGS --bench --no-run-benchmarks"

262 BUILD_BENCH="stack build $STACK_BUILD_FLAGS --bench --no-run-benchmarks"

257else

263else

264+ # XXX cabal issue "cabal v2-exec which" cannot find benchmark/test executables

258− WHICH_COMMAND="cabal v2-exec which"

265+ #WHICH_COMMAND="cabal v2-exec which"

266+ WHICH_COMMAND=cabal_which

259 BUILD_CHART_EXE="cabal v2-build --flags dev chart"

267 BUILD_CHART_EXE="cabal v2-build --flags dev chart"

260 GET_BENCH_PROG=cabal_bench_prog

268 GET_BENCH_PROG=cabal_bench_prog

261 BUILD_BENCH="cabal v2-build $CABAL_BUILD_FLAGS --enable-benchmarks"

269 BUILD_BENCH="cabal v2-build $CABAL_BUILD_FLAGS --enable-benchmarks"