Skip to content

Support tokentest asan #41

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Support tokentest asan #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12c34bb
resources/VM-container-tests.sh: Adapt OVMF_VARS name
k0ch4lo Sep 18, 2025
6e1f797
vars/stepIntegrationTest: Make lock dependend on serial
k0ch4lo Sep 26, 2025
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 resources/VM-container-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,14 @@ fi
# -----------------------------------------------

# copy for faster startup
cp /usr/share/OVMF/OVMF_VARS.fd .
if [ -f "/usr/share/OVMF/OVMF_VARS.fd" ];then
cp /usr/share/OVMF/OVMF_VARS.fd OVMF_VARS.fd
elif [ -f "/usr/share/OVMF/OVMF_VARS_4M.fd" ];then
cp /usr/share/OVMF/OVMF_VARS_4M.fd OVMF_VARS.fd
else
echo_error "Failed to locate OVMF_VARS"
exit 1
fi

STAGE="BOOT1"
# Start test VM
Expand Down
12 changes: 11 additions & 1 deletion resources/VM-management.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,16 @@ wait_vm () {
}

start_vm() {
ovmf_code=""
if [ -f "/usr/share/OVMF/OVMF_CODE.fd" ];then
ovmf_code="/usr/share/OVMF/OVMF_CODE.fd"
elif [ -f "/usr/share/OVMF/OVMF_CODE_4M.fd" ];then
ovmf_code="/usr/share/OVMF/OVMF_CODE_4M.fd"
else
echo_error "Failed to locate OVMF_CODE"
exit 1
fi

qemu-system-x86_64 -machine accel=kvm,vmport=off -m 64G -smp 4 -cpu host -bios OVMF.fd \
-monitor unix:./${PROCESS_NAME}.qemumon,server,nowait \
-name gyroidos-tester,process=${PROCESS_NAME} -nodefaults -nographic \
Expand All @@ -99,7 +109,7 @@ start_vm() {
-device scsi-hd,drive=hd1 \
-drive if=none,id=hd1,file=${PROCESS_NAME}.ext4fs,cache=directsync,format=raw \
-device e1000,netdev=net0 -netdev user,id=net0,hostfwd=tcp::$SSH_PORT-:22 \
-drive "if=pflash,format=raw,readonly=on,file=/usr/share/OVMF/OVMF_CODE.fd" \
-drive "if=pflash,format=raw,readonly=on,file=$ovmf_code" \
-drive "if=pflash,format=raw,file=./OVMF_VARS.fd" \
$VNC \
$TELNET \
Expand Down
2 changes: 1 addition & 1 deletion vars/stepIntegrationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def call(Map target) {
script {
def testFunc = integrationTestMap[target.gyroid_machine];
if (testFunc != null) {
if (target.buildtype != "schsm") {
if ("${target.schsm_serial}" == "") {
echo "Entering integration test without acquiring lock"
testFunc(target);
} else {
Expand Down