Skip to content

Commit 287894f

Browse files
authored
Merge pull request rust-lang#14 from antoyo/fix/vm-link-and-stdarch-tests
Fix vm link and stdarch tests
2 parents 111b339 + c7ac792 commit 287894f

File tree

4 files changed

+5
-11
lines changed

4 files changed

+5
-11
lines changed

.github/workflows/m68k.yml

+1-7
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,7 @@ jobs:
5454
run: curl -LO https://github.com/cross-cg-gcc-tools/cross-gcc/releases/latest/download/gcc-m68k-13.deb
5555

5656
- name: Download VM artifact
57-
uses: dawidd6/action-download-artifact@v2
58-
with:
59-
workflow: m68k.yml
60-
name: debian-m68k
61-
repo: cross-cg-gcc-tools/vms
62-
branch: master
63-
event: push
57+
run: curl -LO https://github.com/cross-cg-gcc-tools/vms/releases/latest/download/debian-m68k.img
6458

6559
- name: Setup path to libgccjit
6660
run: |

.github/workflows/stdarch.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ jobs:
8989
- name: Run stdarch tests
9090
if: ${{ !matrix.cargo_runner }}
9191
run: |
92-
CHANNEL=release TARGET=x86_64-unknown-linux-gnu CG_RUSTFLAGS="-Ainternal_features" cargo test --manifest-path build/build_sysroot/sysroot_src/library/stdarch/Cargo.toml
92+
CHANNEL=release TARGET=x86_64-unknown-linux-gnu CG_RUSTFLAGS="-Ainternal_features" ./y.sh cargo test --manifest-path build/build_sysroot/sysroot_src/library/stdarch/Cargo.toml
9393
9494
- name: Run stdarch tests
9595
if: ${{ matrix.cargo_runner }}
9696
run: |
9797
# FIXME: these tests fail when the sysroot is compiled with LTO because of a missing symbol in proc-macro.
98-
STDARCH_TEST_EVERYTHING=1 CHANNEL=release CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="${{ matrix.cargo_runner }}" TARGET=x86_64-unknown-linux-gnu CG_RUSTFLAGS="-Ainternal_features" cargo test --manifest-path build/build_sysroot/sysroot_src/library/stdarch/Cargo.toml -- --skip rtm --skip tbm --skip sse4a
98+
STDARCH_TEST_EVERYTHING=1 CHANNEL=release CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="${{ matrix.cargo_runner }}" TARGET=x86_64-unknown-linux-gnu CG_RUSTFLAGS="-Ainternal_features" ./y.sh cargo test --manifest-path build/build_sysroot/sysroot_src/library/stdarch/Cargo.toml -- --skip rtm --skip tbm --skip sse4a

tests/hello-world/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[package]
22
name = "hello_world"
33

4-
[dependencies]
4+
[dependencies]

tests/hello-world/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
fn main() {
22
println!("Hello, world!");
3-
}
3+
}

0 commit comments

Comments
 (0)