diff options
| author | antoyo <antoyo@users.noreply.github.com> | 2024-03-30 09:05:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-30 09:05:45 -0400 |
| commit | 287894f374b96a137b012d83f0cf7cd2c3ee7607 (patch) | |
| tree | bde5ba0f63256c71d8bcc0e4960483d03ee1ddbc | |
| parent | 111b3395a8bdb52e78cef2b2a2e2c9ad6f06719c (diff) | |
| parent | c7ac792687283b8c48fae679bc8cf65387181fa4 (diff) | |
| download | rust-287894f374b96a137b012d83f0cf7cd2c3ee7607.tar.gz rust-287894f374b96a137b012d83f0cf7cd2c3ee7607.zip | |
Merge pull request #14 from antoyo/fix/vm-link-and-stdarch-tests
Fix vm link and stdarch tests
| -rw-r--r-- | .github/workflows/m68k.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/stdarch.yml | 4 | ||||
| -rw-r--r-- | tests/hello-world/Cargo.toml | 2 | ||||
| -rw-r--r-- | tests/hello-world/src/main.rs | 2 |
4 files changed, 5 insertions, 11 deletions
diff --git a/.github/workflows/m68k.yml b/.github/workflows/m68k.yml index 47a235b0218..25a5d2cf3d7 100644 --- a/.github/workflows/m68k.yml +++ b/.github/workflows/m68k.yml @@ -54,13 +54,7 @@ jobs: run: curl -LO https://github.com/cross-cg-gcc-tools/cross-gcc/releases/latest/download/gcc-m68k-13.deb - name: Download VM artifact - uses: dawidd6/action-download-artifact@v2 - with: - workflow: m68k.yml - name: debian-m68k - repo: cross-cg-gcc-tools/vms - branch: master - event: push + run: curl -LO https://github.com/cross-cg-gcc-tools/vms/releases/latest/download/debian-m68k.img - name: Setup path to libgccjit run: | diff --git a/.github/workflows/stdarch.yml b/.github/workflows/stdarch.yml index dc52c94376c..e285e9119f7 100644 --- a/.github/workflows/stdarch.yml +++ b/.github/workflows/stdarch.yml @@ -89,10 +89,10 @@ jobs: - name: Run stdarch tests if: ${{ !matrix.cargo_runner }} run: | - 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 + 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 - name: Run stdarch tests if: ${{ matrix.cargo_runner }} run: | # FIXME: these tests fail when the sysroot is compiled with LTO because of a missing symbol in proc-macro. - 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 + 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 diff --git a/tests/hello-world/Cargo.toml b/tests/hello-world/Cargo.toml index a3b6813443f..0b8cdc63fbe 100644 --- a/tests/hello-world/Cargo.toml +++ b/tests/hello-world/Cargo.toml @@ -1,4 +1,4 @@ [package] name = "hello_world" -[dependencies] \ No newline at end of file +[dependencies] diff --git a/tests/hello-world/src/main.rs b/tests/hello-world/src/main.rs index fbedd920525..e7a11a969c0 100644 --- a/tests/hello-world/src/main.rs +++ b/tests/hello-world/src/main.rs @@ -1,3 +1,3 @@ fn main() { println!("Hello, world!"); -} \ No newline at end of file +} |