Skip to content

Revert "test-on-testmachine: use $BASEDIR from functions" #2042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
larsewi merged 1 commit into from
Nov 17, 2025
Merged

Revert "test-on-testmachine: use $BASEDIR from functions" #2042

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion build-scripts/test-on-testmachine
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,17 @@ chroot)
;;
esac

SCRIPT_BASEDIR="$(
cd "$(dirname "$0")"
pwd
)" # /home/user/whatever/buildscripts/build-scripts
SCRIPT_BASEDIR="$(dirname "$SCRIPT_BASEDIR")" # /home/user/whatever/buildscripts
SCRIPT_BASEDIR="$(dirname "$SCRIPT_BASEDIR")" # /home/user/whatever

# We still need to perform several cleanup tasks after doing a chroot test run.
# So wrap the test execution in an if so that we can proceed with clean-up on error.
log_debug "Executing tests on test machine..."
if remote_script_general "$SCRIPT" "$LOGIN_COMMAND" "$BASEDIR"; then
if remote_script_general "$SCRIPT" "$LOGIN_COMMAND" "$SCRIPT_BASEDIR"; then
return_code=0
else
return_code=$?
Expand Down