commit fe0e510dce20e5f89c1f69fcfa9488e0d63bc3fa
parent 5aab6ed1805a9a3cdb2b1f4651461136fc344b2b
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Fri, 31 Jan 2025 15:39:55 +0100
Correction of the WAD update test
The test did not guarantee the use of the local version of git-wad and
therefore used the installed version.
Diffstat:
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/test_update.sh b/test_update.sh
@@ -82,12 +82,13 @@ dd if=/dev/random of="${repo}_ref/file2.bin" bs=1024 count="314"
git add ./file2.bin
git commit -m "Add a new binary"
git push origin master
-git wad push
+"${git_wad}" push
# Pull the updates
cd "${repo}"
git pull origin master
-git wad pull
+"${git_wad}" pull
+"${git_wad}" status
diff "${repo}/file0.bin" "${repo}_ref/file0.bin"
diff "${repo}/file1.bin" "${repo}_ref/file1.bin"
diff "${repo}/file2.bin" "${repo}_ref/file2.bin"
@@ -98,7 +99,7 @@ dd if=/dev/random of="${repo}_ref/file1.bin" \
bs=1 count=123 seek="$((42*1024))" conv=notrunc
git commit -am "Update some binarie content"
git push origin master
-git wad push
+"${git_wad}" push
# Check that files differ between desynchronized working directories
cd "${repo}"
@@ -106,9 +107,9 @@ diff "${repo}/file0.bin" "${repo}_ref/file0.bin"
! diff "${repo}/file1.bin" "${repo}_ref/file1.bin" || exit 1
diff "${repo}/file2.bin" "${repo}_ref/file2.bin"
git pull origin master
-git wad fetch
+"${git_wad}" fetch
! diff "${repo}/file1.bin" "${repo}_ref/file1.bin" || exit 1
-git wad checkout
+"${git_wad}" checkout
diff "${repo}/file1.bin" "${repo}_ref/file1.bin"
########################################################################
@@ -125,11 +126,11 @@ check_wads_count 4
# Prune it and check that nothing was removed,
# i.e. there are always 4 WADs
-git wad prune
+"${git_wad}" prune
check_wads_count 4
# Prune all files except the WADs of the current HEAD, so that one file
# is deleted, namely the previous version of file1.bin before it was
# updated.
-git wad prune -1
+"${git_wad}" prune -1
check_wads_count 3