summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf.d/compile.conf.sample (renamed from conf.d/compile.conf)8
-rw-r--r--conf.d/ezbench.conf5
-rw-r--r--conf.d/ezbench.conf.sample5
-rwxr-xr-xezbench.sh5
4 files changed, 13 insertions, 10 deletions
diff --git a/conf.d/compile.conf b/conf.d/compile.conf.sample
index 602f283..4548d84 100644
--- a/conf.d/compile.conf
+++ b/conf.d/compile.conf.sample
@@ -1,11 +1,11 @@
-#function compile_pre_hook() {
+function compile_pre_hook() {
# Accessible variables
# $commit [RO]: SHA1 id of the current commit
# $commitName [RO]: Name of the commit
-#}
+}
-#function compile_post_hook() {
+function compile_post_hook() {
# Accessible variables
# $commit [RO]: SHA1 id of the current commit
# $commitName [RO]: Name of the commit
-#}
+}
diff --git a/conf.d/ezbench.conf b/conf.d/ezbench.conf
deleted file mode 100644
index 8eb8083..0000000
--- a/conf.d/ezbench.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#function ezbench_pre_hook() {
-#}
-
-#function ezbench_post_hook() {
-#}
diff --git a/conf.d/ezbench.conf.sample b/conf.d/ezbench.conf.sample
new file mode 100644
index 0000000..2413ad4
--- /dev/null
+++ b/conf.d/ezbench.conf.sample
@@ -0,0 +1,5 @@
+function ezbench_pre_hook() {
+}
+
+function ezbench_post_hook() {
+}
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