Skip to content

Commit abc939a

Browse files
author
Raghuveer Devulapalli
committed
Bug fix in benchmark script
1 parent 4cbd181 commit abc939a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

scripts/branch-compare.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ echo "Comparing main branch with $branch"
1010
build_branch() {
1111
dir_name=$1
1212
if [ ! -d $dir_name ]; then
13-
git clone -b $branch ${BASE_DIR} $dir_name
13+
git clone -b $dir_name ${BASE_DIR} $dir_name
1414
else
1515
# if it exists, just update it
1616
cd $dir_name
1717
git fetch origin
18-
git rebase origin/$branch
18+
git rebase origin/$dir_name
1919
# rebase fails with conflict, delete and start over
2020
if [ "$?" != 0 ]; then
2121
cd ..
22-
rm -rf $branch
23-
git clone -b $branch ${BASE_DIR} $dir_name
22+
rm -rf $dir_name
23+
git clone -b $dir_name ${BASE_DIR} $dir_name
2424
else
2525
cd ..
2626
fi
@@ -40,8 +40,8 @@ fi
4040
compare=$(realpath google-benchmark/tools/compare.py)
4141
build_branch $branch
4242
build_branch "main"
43-
baseline=$(realpath ${branch}/builddir/benchexe)
44-
contender=$(realpath main/builddir/benchexe)
43+
contender=$(realpath ${branch}/builddir/benchexe)
44+
baseline=$(realpath main/builddir/benchexe)
4545

4646
if [ -z "$1" ]; then
4747
echo "Comparing all benchmarks .."

0 commit comments

Comments
 (0)