From 0cfd6251c1a3bfe5f5f52976cdc79509a707ff7b Mon Sep 17 00:00:00 2001 From: Harendra Kumar Date: Thu, 2 Sep 2021 15:20:07 +0530 Subject: [PATCH] Use limit-build-mem by default in bench/test scripts Otherwise we may accidentally run into memory hog issues. --- benchmark/bench-report/bin/bench-runner.sh | 2 +- bin/test.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/benchmark/bench-report/bin/bench-runner.sh b/benchmark/bench-report/bin/bench-runner.sh index b14e30182..45061981f 100755 --- a/benchmark/bench-report/bin/bench-runner.sh +++ b/benchmark/bench-report/bin/bench-runner.sh @@ -466,7 +466,7 @@ MEASURE=1 GAUGE_ARGS= BUILD_ONCE=0 -CABAL_BUILD_OPTIONS="--flag fusion-plugin " +CABAL_BUILD_OPTIONS="--flag fusion-plugin --flag limit-build-mem" #----------------------------------------------------------------------------- # Read command line diff --git a/bin/test.sh b/bin/test.sh index 2f9bb1041..d633f16b9 100755 --- a/bin/test.sh +++ b/bin/test.sh @@ -49,6 +49,7 @@ COVERAGE=0 MEASURE=1 HPC_REPORT_OPTIONS= RAW=0 +CABAL_BUILD_OPTIONS="--flag limit-build-mem" # XXX add a bisect option while test -n "$1" @@ -58,7 +59,7 @@ do # options with arguments --targets) shift; TARGETS=$1; shift ;; --with-compiler) shift; CABAL_WITH_COMPILER=$1; shift ;; - --cabal-build-options) shift; CABAL_BUILD_OPTIONS=$1; shift ;; + --cabal-build-options) shift; CABAL_BUILD_OPTIONS+=$1; shift ;; --hpc-report-options) shift; HPC_REPORT_OPTIONS=$1; shift ;; --rtsopts) shift; RTS_OPTIONS=$1; shift ;; # flags