Skip to content

Commit 1254a62

Browse files
committed
Misc updates
1. Correct warning message about missing main.go files. 2. Use go 1.24 to build test app in CI. 3. Fix wrong comments on assembly code.
1 parent 6812711 commit 1254a62

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,7 @@ jobs:
427427
- run: | # Build Go test apps.
428428
cd mirrord/layer/tests
429429
../../../scripts/build_go_apps.sh 24
430+
- run: ./mirrord/layer/tests/apps/dlopen_cgo/build_test_app.sh
430431
- uses: actions/setup-go@v5
431432
with:
432433
go-version: "1.25"
@@ -472,7 +473,6 @@ jobs:
472473
- run: |
473474
cd mirrord/layer/tests/apps/rebind0
474475
cargo build
475-
- run: ./mirrord/layer/tests/apps/dlopen_cgo/build_test_app.sh
476476
- run: ./scripts/build_c_apps.sh
477477
- run: cargo test --target x86_64-unknown-linux-gnu -p mirrord-layer
478478
- name: create dummy file to compile wizard feature

mirrord/layer/src/go/c_shared/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ pub(crate) mod go_1_24 {
204204
"lea r9, [rsp+0x8]",
205205
// Store r9 in g->sched->sp.
206206
"mov QWORD PTR [r14+0x38],r9",
207-
// Store r9 in g->sched->ret.
207+
// Store 0 in g->sched->ret.
208208
"mov QWORD PTR [r14+0x58],0x0",
209-
// Store r9 in g->sched->bp.
209+
// Store rbp in g->sched->bp.
210210
"mov QWORD PTR [r14+0x68],rbp",
211211
// Store g->sched->ctxt in r9.
212212
"mov r9, QWORD PTR [r14+0x50]",

mirrord/layer/tests/apps/dlopen_cgo/build_test_app.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ echo "Script directory: $SCRIPT_DIR"
1717

1818
# Ensure files exist
1919
if [[ ! -f "$SERVER_GO_FILE" ]]; then
20-
echo "ERROR: main.go not found in $SCRIPT_DIR"
20+
echo "ERROR: server/main.go not found in $SCRIPT_DIR"
2121
exit 1
2222
fi
2323

2424
if [[ ! -f "$FILEOPS_GO_FILE" ]]; then
25-
echo "ERROR: main.go not found in $SCRIPT_DIR"
25+
echo "ERROR: fileops/main.go not found in $SCRIPT_DIR"
2626
exit 1
2727
fi
2828

0 commit comments

Comments
 (0)