summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-09-02 16:37:25 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-05 11:56:02 +0100
commit91ae03931e1d4d95b07c7c6a9583e8b3d0c2787f (patch)
tree114bb5d51b88f2b3ad8a7df3774633ba71fde7f4
parent5f5115a64b2a1589951b606a1680eeba185c42ed (diff)
downloadpoky-91ae03931e1d4d95b07c7c6a9583e8b3d0c2787f.tar.gz
build-perf-test-wrapper.sh: fix handling of -C argument
Not specifying -C caused oe-build-perf-test to try to commit results to the build directory. (From OE-Core rev: 6f4786f5522c366a7fd92f630c3f32629a9f9471) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/contrib/build-perf-test-wrapper.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/contrib/build-perf-test-wrapper.sh b/scripts/contrib/build-perf-test-wrapper.sh
index efc2b79d6c..d61e438933 100755
--- a/scripts/contrib/build-perf-test-wrapper.sh
+++ b/scripts/contrib/build-perf-test-wrapper.sh
@@ -37,7 +37,6 @@ EOF
37# Parse command line arguments 37# Parse command line arguments
38archive_dir=~/perf-results/archives 38archive_dir=~/perf-results/archives
39commitish="" 39commitish=""
40results_repo=""
41while getopts "ha:c:C:w:" opt; do 40while getopts "ha:c:C:w:" opt; do
42 case $opt in 41 case $opt in
43 h) usage 42 h) usage
@@ -48,6 +47,7 @@ while getopts "ha:c:C:w:" opt; do
48 c) commitish=$OPTARG 47 c) commitish=$OPTARG
49 ;; 48 ;;
50 C) results_repo=`realpath "$OPTARG"` 49 C) results_repo=`realpath "$OPTARG"`
50 commit_results=("--commit-results" "$results_repo")
51 ;; 51 ;;
52 w) base_dir=`realpath "$OPTARG"` 52 w) base_dir=`realpath "$OPTARG"`
53 ;; 53 ;;
@@ -110,7 +110,7 @@ fi
110if ! oe-build-perf-test --out-dir "$results_dir" \ 110if ! oe-build-perf-test --out-dir "$results_dir" \
111 --globalres-file "$globalres_log" \ 111 --globalres-file "$globalres_log" \
112 --lock-file "$base_dir/oe-build-perf.lock" \ 112 --lock-file "$base_dir/oe-build-perf.lock" \
113 --commit-results "$results_repo" \ 113 "${commit_results[@]}" \
114 --commit-results-branch "{tester_host}/{git_branch}/$machine" \ 114 --commit-results-branch "{tester_host}/{git_branch}/$machine" \
115 --commit-results-tag "{tester_host}/{git_branch}/$machine/{git_commit_count}-g{git_commit}/{tag_num}"; then 115 --commit-results-tag "{tester_host}/{git_branch}/$machine/{git_commit_count}-g{git_commit}/{tag_num}"; then
116 echo "oe-build-perf-test script failed!" 116 echo "oe-build-perf-test script failed!"