Skip to content

Commit e521d91

Browse files
committed
U204-026-arch-mix/update.sh: do not assume dev branch is pushed
Rework the update scripts so that they work even when the gnatcoverage repository changes are only local (but still committed). The scripts used to assume that the currently checked out branch was also pushed upstream.
1 parent 8600c49 commit e521d91

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

testsuite/tests/U204-026-arch-mix/update.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ then
3333
"$IOD_DEV_DIR/create-base.py" --base-image x86_64-windows-2019
3434
fi
3535

36-
git_branch=$(git rev-parse --abbrev-ref HEAD)
37-
ssh iod 'bash -s' < update_arch_mix_windows.sh $git_branch
36+
ssh iod 'bash -s' < update_win_setup_git.sh
37+
git push -f iod:gnatcoverage HEAD:wip
38+
ssh iod 'bash -s' < update_arch_mix_windows.sh
3839
rsync -av iod:/cygdrive/c/tmp/U204-026-arch-mix/gen/* gen/

testsuite/tests/U204-026-arch-mix/update_arch_mix_windows.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,16 @@
22

33
set -ex
44

5-
if [ $# -eq 0 ]; then
6-
echo "No arguments provided. Please provide the name of the gnatcov branch"
7-
exit 1
8-
fi
9-
105
# Create a sandbox
116
cd /Users/itmgr
12-
if ! [ -d gnatcoverage ]
13-
then
14-
git clone git-adacore:eng/cov/gnatcoverage
15-
fi
167
if ! [ -d wave ]
178
then
189
anod init wave
1910
fi
2011

2112
# Checkout the right gnatcov branch
2213
cd /Users/itmgr/gnatcoverage
23-
git fetch origin
24-
git checkout origin/$1
14+
git reset --hard wip
2515

2616
# Build gnatcov
2717
cd /Users/itmgr/wave
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Set up the gnatcoverage repositoy on the Windows IOD machie
2+
3+
set -ex
4+
5+
cd /Users/itmgr
6+
if ! [ -d gnatcoverage ]
7+
then
8+
git clone git-adacore:eng/cov/gnatcoverage
9+
fi

0 commit comments

Comments
 (0)