more fixes to support container/root mount action

diff --git a/tests/system-test-privacy-leaks.sh b/tests/system-test-privacy-leaks.sh
index 8d553b6e2bc36a1991142db12b74b88e4258a3cd..17f323ce39be4ecafa58623a588dba1fbf469c20 100755 (executable)
--- a/tests/system-test-privacy-leaks.sh
+++ b/tests/system-test-privacy-leaks.sh
@@ -14,7 +14,7 @@ readonly tempdir
 trap 'rm -Rf -- "$tempdir"' EXIT
 
 # Ensure git-remote-gcrypt is in PATH
-repo_root=$(git rev-parse --show-toplevel)
+repo_root="${PWD}"
 test_version=$(git describe --tags --always --dirty 2>/dev/null || echo "test")
 cp "$repo_root/git-remote-gcrypt" "$tempdir/git-remote-gcrypt"
 sed "s/@@DEV_VERSION@@/$test_version/" "$tempdir/git-remote-gcrypt" >"$tempdir/git-remote-gcrypt.tmp"

diff --git a/tests/system-test-repack.sh b/tests/system-test-repack.sh
index ef876ac5b33408db66722fb801e0b7fa97559125..02216834b1f2c6d156926341960f0e218b4417d1 100755 (executable)
--- a/tests/system-test-repack.sh
+++ b/tests/system-test-repack.sh
@@ -46,7 +46,7 @@ readonly tempdir
 trap "rm -Rf -- '${tempdir}'" EXIT
 
 # Set up the PATH
-repo_root=$(git rev-parse --show-toplevel)
+repo_root="${PWD}"
 test_version=$(git describe --tags --always --dirty 2>/dev/null || echo "test")
 cp "$repo_root/git-remote-gcrypt" "$tempdir/git-remote-gcrypt"
 sed -i "s/@@DEV_VERSION@@/$test_version/" "$tempdir/git-remote-gcrypt"
@@ -112,6 +112,7 @@ print_info "Step 2: Creating repository with large random files..."
 {
        git init -- "${tempdir}/first"
        cd "${tempdir}/first"
+       git checkout -b "${default_branch}"
        for ((i = 0; i < num_commits; ++i)); do
                for ((j = 0; j < files_per_commit; ++j)); do
                        file_index=$((i * files_per_commit + j))

diff --git a/tests/system-test.sh b/tests/system-test.sh
index f51a791b4b158e769f23e8d0c9110622d06921de..71ef23b2337d72a763ff412a46cc75268b52b0a8 100755 (executable)
--- a/tests/system-test.sh
+++ b/tests/system-test.sh
@@ -73,7 +73,7 @@ trap "rm -Rf -- '${tempdir}'" EXIT
 # Set up the PATH to favor the version of git-remote-gcrypt from the repository
 # rather than a version that might already be installed on the user's system.
 # We also copy it to tempdir to inject a version number for testing.
-repo_root=$(git rev-parse --show-toplevel)
+repo_root="${PWD}"
 test_version=$(git describe --tags --always --dirty 2>/dev/null || echo "test")
 cp "$repo_root/git-remote-gcrypt" "$tempdir/git-remote-gcrypt"
 sed "s/@@DEV_VERSION@@/$test_version/" "$tempdir/git-remote-gcrypt" > "$tempdir/git-remote-gcrypt.tmp"