Skip to content

Commit a04754f

Browse files
committed
[ci] run-make/thumb-none-qemu: uses cortex-m-rt crate.
1 parent 719a592 commit a04754f

File tree

1 file changed

+5
-14
lines changed
  • src/test/run-make/thumb-none-qemu

1 file changed

+5
-14
lines changed

src/test/run-make/thumb-none-qemu/Makefile

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,17 @@ HERE := $(shell pwd)
1515

1616

1717
# hint: we could set variables per $(TARGET) basis in order to support other targets.
18-
CRATE := lm3s6965evb
19-
CRATE_URL := https://github.com/japaric/lm3s6965evb
20-
CRATE_SHA1 := 9eeea58826438e84d89e9691a1bb0f85b03d377c
21-
QEMU_CPU := cortex-m3
22-
QEMU_MACHINE := lm3s6965evb
23-
QEMU_OUTPUT_TEXT := "x = 42"
18+
CRATE := cortex-m-rt
19+
CRATE_URL := https://github.com/rust-embedded/cortex-m-rt
20+
CRATE_SHA1 := 62972c8a89ff54b76f9ef0d600c1fcf7a233aabd
2421

2522
all:
2623
env
2724
mkdir -p $(WORK_DIR)
2825
-cd $(WORK_DIR) && rm -rf $(CRATE)
2926
cd $(WORK_DIR) && bash -x $(HERE)/../git_clone_sha1.sh $(CRATE) $(CRATE_URL) $(CRATE_SHA1)
30-
cd $(WORK_DIR)/$(CRATE) && $(CARGO) build --target $(TARGET) -v
31-
cd $(WORK_DIR)/$(CRATE) && qemu-system-arm \
32-
-cpu $(QEMU_CPU) \
33-
-machine $(QEMU_MACHINE) \
34-
-semihosting-config enable=on,target=native \
35-
-nographic \
36-
-kernel target/$(TARGET)/debug/$(CRATE) > out.txt
37-
cd $(WORK_DIR)/$(CRATE) && grep $(QEMU_OUTPUT_TEXT) out.txt
27+
cd $(WORK_DIR)/$(CRATE) && $(CARGO) run --target $(TARGET) --example qemu | grep "x = 42"
28+
cd $(WORK_DIR)/$(CRATE) && $(CARGO) run --target $(TARGET) --example qemu --release | grep "x = 42"
3829
else
3930

4031
all:

0 commit comments

Comments
 (0)