Merge branch 'mr/pmderodat/U204-026-arch-mix' into 'master'

U204-026-arch-mix: various update scripts fixes/enhancements

See merge request eng/das/cov/gnatcoverage!840

In the course of https://gitlab.adacore-it.com/eng/das/cov/gnatcoverage/-/issues/258

Author: pmderodat

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

@@ -12,15 +12,28 @@ fi
 
 # Update the linux artifacts
 cd ..
-cp -rf U204-026-arch-mix /tmp/
+rsync -ar U204-026-arch-mix/ /tmp/U204-026-arch-mix
 cd /tmp/U204-026-arch-mix
 ./gen.sh linux
 cd $cwd
-cp -rf /tmp/U204-026-arch-mix/* .
+rsync -ar /tmp/U204-026-arch-mix/ .
 
-# Then update the windows artifacts
-[ ! -d '/tmp/iod-dev' ] && git clone git-adacore:eng/shared/iod-dev /tmp/iod-dev
-/tmp/iod-dev/create-base.py --base-image x86_64-windows-2019
-git_branch=$(git rev-parse --abbrev-ref HEAD)
-sshpass ssh iod 'bash -s' < update_arch_mix_windows.sh $git_branch
+# Then update the Windows artifacts using an IOD machine. Do not create the IOD
+# instance if one already exists
+IOD_DEV_DIR=/tmp/iod-dev
+INSTANCES_FILE="$IOD_DEV_DIR/instances.txt"
+if ! [ -d "$IOD_DEV_DIR" ]
+then
+    git clone git-adacore:eng/shared/iod-dev "$IOD_DEV_DIR"
+fi
+iod list --instances > "$INSTANCES_FILE" 2>&1
+if ! grep "You have some running instance" "$INSTANCES_FILE" \
+    > /dev/null
+then
+    "$IOD_DEV_DIR/create-base.py" --base-image x86_64-windows-2019
+fi
+
+ssh iod 'bash -s' < update_win_setup_git.sh
+git push -f iod:gnatcoverage HEAD:wip
+ssh iod 'bash -s' < update_arch_mix_windows.sh
 rsync -av iod:/cygdrive/c/tmp/U204-026-arch-mix/gen/* gen/

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

@@ -2,35 +2,35 @@
 
 set -ex
 
-if [ $# -eq 0 ]; then
-  echo "No arguments provided. Please provide the name of the gnatcov branch"
-  exit 1
-fi
-
 # Create a sandbox
 cd /Users/itmgr
-git clone git-adacore:eng/cov/gnatcoverage
-anod init wave
+if ! [ -d wave ]
+then
+    anod init wave
+fi
 
 # Checkout the right gnatcov branch
 cd /Users/itmgr/gnatcoverage
-git fetch origin
-git checkout origin/$1
+git reset --hard wip
 
 # Build gnatcov
 cd /Users/itmgr/wave
+anod vcs --reset
 anod vcs --add-repo gnatcoverage /Users/itmgr/gnatcoverage
-anod build gnatcov --interactive never
+anod build gnatcov --smart
+anod install gnatall -Qstable
 eval $(anod printenv gnatcov)
 eval $(anod printenv gnatall -Qstable)
 
 # Then, retrieve the sources of the arch-mix test
-rm -rf /Users/itmgr/gnatcoverage/testsuite/tests/U204-026-arch-mix/gen/x86_64-windows
-cp -r /Users/itmgr/gnatcoverage/testsuite/tests/U204-026-arch-mix /cygdrive/c/tmp
-cd /cygdrive/c/tmp/U204-026-arch-mix
+SRC_DIR=/Users/itmgr/gnatcoverage/testsuite/tests/U204-026-arch-mix
+BUILD_DIR=/cygdrive/c/tmp/U204-026-arch-mix
+rm -rf "$SRC_DIR/gen/x86_64-windows"
+rsync -ar "$SRC_DIR/" "$BUILD_DIR"
+cd "$BUILD_DIR"
 chmod +x gen.sh
 gnatcov setup
 ./gen.sh windows
 
 # Copy back the generated sources
-cp -r /cygdrive/c/tmp/U204-026-arch-mix/gen/* /Users/itmgr/gnatcoverage/testsuite/tests/U204-026-arch-mix/gen/
+rsync -ar "$BUILD_DIR/gen/" "$SRC_DIR/gen"

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

@@ -0,0 +1,9 @@
+# Set up the gnatcoverage repositoy on the Windows IOD machie
+
+set -ex
+
+cd /Users/itmgr
+if ! [ -d gnatcoverage ]
+then
+    git clone git-adacore:eng/cov/gnatcoverage
+fi