summaryrefslogtreecommitdiff
path: root/ezbench.sh
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2015-07-24 14:55:42 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2015-07-28 20:21:31 +0100
commit9ff22254fa10fc432ad7f0d32c212711ad4f128e (patch)
treeeaac84d82891f23ff2d42b9cb204118c436164bc /ezbench.sh
parentf68bb5a0cd502586ebdefd11b29992257cce3936 (diff)
Provide a conf.d for splitting up the callback definitions
Diffstat (limited to 'ezbench.sh')
-rwxr-xr-xezbench.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/ezbench.sh b/ezbench.sh
index a9927fe..e50a17e 100755
--- a/ezbench.sh
+++ b/ezbench.sh
@@ -24,7 +24,10 @@ gitRepoDir=''
ezBenchDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
# Default user options
-for conf in $ezBenchDir/conf.d/**/*.conf; do source $conf; done
+for conf in $ezBenchDir/conf.d/**/*.conf; do
+ [ "$conf" = "$ezBenchDir/conf.d/**/*.conf" ] && continue
+ source $conf
+done
source "$ezBenchDir/test_options.sh" # Allow test_options.sh to override all
# initial cleanup