Skip to content

Commit 1c79360

Browse files
committed
Reenable m68k CI
1 parent 482e854 commit 1c79360

File tree

1 file changed

+16
-22
lines changed

1 file changed

+16
-22
lines changed

.github/workflows/m68k.yml

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,7 @@ jobs:
9191
./y.sh prepare --only-libcore --cross
9292
./y.sh build --sysroot --features compiler-builtins-no-f16-f128 --target-triple m68k-unknown-linux-gnu
9393
./y.sh test --mini-tests --target-triple m68k-unknown-linux-gnu
94-
# FIXME: since https://github.com/rust-lang/rust/pull/140809, we cannot run programs for architectures not
95-
# supported by the object crate, since this adds a dependency on symbols.o for the panic runtime.
96-
# And as such, a wrong order of the object files in the linker command now fails with an undefined reference
97-
# to some symbols like __rustc::rust_panic.
98-
#CG_GCC_TEST_TARGET=m68k-unknown-linux-gnu ./y.sh test --cargo-tests --target-triple m68k-unknown-linux-gnu
94+
CG_GCC_TEST_TARGET=m68k-unknown-linux-gnu ./y.sh test --cargo-tests --target-triple m68k-unknown-linux-gnu
9995
./y.sh clean all
10096
10197
- name: Prepare dependencies
@@ -104,23 +100,21 @@ jobs:
104100
git config --global user.name "User"
105101
./y.sh prepare --cross
106102
107-
# FIXME: We cannot run programs for architectures not supported by the object crate. See comment above.
108-
#- name: Run tests
109-
#run: |
110-
#./y.sh test --target-triple m68k-unknown-linux-gnu --release --clean --build-sysroot --sysroot-features compiler-builtins-no-f16-f128 ${{ matrix.commands }}
111-
112-
# FIXME: We cannot run programs for architectures not supported by the object crate. See comment above.
113-
#- name: Run Hello World!
114-
#run: |
115-
#./y.sh build --target-triple m68k-unknown-linux-gnu
116-
117-
#vm_dir=$(pwd)/vm
118-
#cd tests/hello-world
119-
#CG_RUSTFLAGS="-Clinker=m68k-unknown-linux-gnu-gcc" ../../y.sh cargo build --target m68k-unknown-linux-gnu
120-
#sudo cp target/m68k-unknown-linux-gnu/debug/hello_world $vm_dir/home/
121-
#sudo chroot $vm_dir qemu-m68k-static /home/hello_world > hello_world_stdout
122-
#expected_output="40"
123-
#test $(cat hello_world_stdout) == $expected_output || (echo "Output differs. Actual output: $(cat hello_world_stdout)"; exit 1)
103+
- name: Run tests
104+
run: |
105+
./y.sh test --target-triple m68k-unknown-linux-gnu --release --clean --build-sysroot --sysroot-features compiler-builtins-no-f16-f128 ${{ matrix.commands }}
106+
107+
- name: Run Hello World!
108+
run: |
109+
./y.sh build --target-triple m68k-unknown-linux-gnu
110+
111+
vm_dir=$(pwd)/vm
112+
cd tests/hello-world
113+
CG_RUSTFLAGS="-Clinker=m68k-unknown-linux-gnu-gcc" ../../y.sh cargo build --target m68k-unknown-linux-gnu
114+
sudo cp target/m68k-unknown-linux-gnu/debug/hello_world $vm_dir/home/
115+
sudo chroot $vm_dir qemu-m68k-static /home/hello_world > hello_world_stdout
116+
expected_output="40"
117+
test $(cat hello_world_stdout) == $expected_output || (echo "Output differs. Actual output: $(cat hello_world_stdout)"; exit 1)
124118
125119
# Summary job for the merge queue.
126120
# ALL THE PREVIOUS JOBS NEED TO BE ADDED TO THE `needs` SECTION OF THIS JOB!

0 commit comments

Comments
 (0)