summaryrefslogtreecommitdiff
path: root/ezbench.sh
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2015-07-24 14:55:42 +0100
committerMartin Peres <martin.peres@linux.intel.com>2015-07-27 15:49:52 +0300
commitbcd03172408c09e513df5ff708c119a7d66906be (patch)
tree1612076c34a59b73df9ec0f18fe7741426fc6fbd /ezbench.sh
parent9957356e5fdf22362f6d1b1361b98312d91abe8e (diff)
Provide a conf.d for splitting up the callback definitions
Diffstat (limited to 'ezbench.sh')
-rwxr-xr-xezbench.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/ezbench.sh b/ezbench.sh
index 0658995..bcae9ca 100755
--- a/ezbench.sh
+++ b/ezbench.sh
@@ -21,7 +21,8 @@ gitRepoDir=''
ezBenchDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
# Default user options
-source "$ezBenchDir/test_options.sh"
+for conf in $ezBenchDir/conf.d/**/*.conf; do source $conf; done
+source "$ezBenchDir/test_options.sh" # Allow test_options.sh to override all
# initial cleanup
mkdir $ezBenchDir/logs/ 2> /dev/null