From 7154d39231fd8051bc207dda3afba21a11b14fcd Mon Sep 17 00:00:00 2001 From: Jieyou Xu Date: Fri, 5 Sep 2025 16:28:10 +0800 Subject: [PATCH] tests: move `run-make` tests requiring in-tree cargo to `run-make-cargo` test suite --- tests/{run-make => run-make-cargo}/apple-slow-tls/rmake.rs | 0 .../apple-slow-tls/tls_test/Cargo.toml | 0 .../apple-slow-tls/tls_test/src/main.rs | 0 tests/{run-make => run-make-cargo}/compiler-builtins/Cargo.toml | 0 tests/{run-make => run-make-cargo}/compiler-builtins/lib.rs | 0 tests/{run-make => run-make-cargo}/compiler-builtins/rmake.rs | 0 .../{run-make => run-make-cargo}/rustc-crates-on-stable/rmake.rs | 0 .../rustdoc-scrape-examples-paths/foo/Cargo.toml | 0 .../rustdoc-scrape-examples-paths/foo/examples/complex.rs | 0 .../rustdoc-scrape-examples-paths/foo/examples/tester.rs | 0 .../rustdoc-scrape-examples-paths/foo/src/lib.rs | 0 .../rustdoc-scrape-examples-paths/rmake.rs | 0 tests/{run-make => run-make-cargo}/thumb-none-cortex-m/rmake.rs | 0 .../thumb-none-qemu/example/.cargo/config.toml | 0 .../thumb-none-qemu/example/Cargo.lock | 0 .../thumb-none-qemu/example/Cargo.toml | 0 .../{run-make => run-make-cargo}/thumb-none-qemu/example/memory.x | 0 .../thumb-none-qemu/example/src/main.rs | 0 tests/{run-make => run-make-cargo}/thumb-none-qemu/rmake.rs | 0 tests/{run-make => run-make-cargo}/uefi-qemu/rmake.rs | 0 .../uefi-qemu/uefi_qemu_test/Cargo.lock | 0 .../uefi-qemu/uefi_qemu_test/Cargo.toml | 0 .../uefi-qemu/uefi_qemu_test/src/main.rs | 0 .../x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_asm.checks | 0 .../x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_c.checks | 0 .../x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_c_asm.checks | 0 .../x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_cxx.checks | 0 .../x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_cxx_asm.checks | 0 .../x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_asm.checks | 0 .../x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c.checks | 0 .../x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c_asm.checks | 0 .../cmake_plus_one_c_global_asm.checks | 0 .../x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx.checks | 0 .../x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx_asm.checks | 0 .../cmake_plus_one_cxx_global_asm.checks | 0 .../x86_64-fortanix-unknown-sgx-lvi/enclave/Cargo.toml | 0 .../x86_64-fortanix-unknown-sgx-lvi/enclave/build.rs | 0 .../x86_64-fortanix-unknown-sgx-lvi/enclave/foo.c | 0 .../x86_64-fortanix-unknown-sgx-lvi/enclave/foo_asm.s | 0 .../x86_64-fortanix-unknown-sgx-lvi/enclave/foo_cxx.cpp | 0 .../enclave/libcmake_foo/CMakeLists.txt | 0 .../enclave/libcmake_foo/src/foo.c | 0 .../enclave/libcmake_foo/src/foo_asm.s | 0 .../enclave/libcmake_foo/src/foo_cxx.cpp | 0 .../x86_64-fortanix-unknown-sgx-lvi/enclave/src/main.rs | 0 .../x86_64-fortanix-unknown-sgx-lvi/jumpto.checks | 0 .../print.with_frame_pointers.checks | 0 .../print.without_frame_pointers.checks | 0 .../x86_64-fortanix-unknown-sgx-lvi/rmake.rs | 0 .../rust_plus_one_global_asm.checks | 0 .../x86_64-fortanix-unknown-sgx-lvi/unw_getcontext.checks | 0 51 files changed, 0 insertions(+), 0 deletions(-) rename tests/{run-make => run-make-cargo}/apple-slow-tls/rmake.rs (100%) rename tests/{run-make => run-make-cargo}/apple-slow-tls/tls_test/Cargo.toml (100%) rename tests/{run-make => run-make-cargo}/apple-slow-tls/tls_test/src/main.rs (100%) rename tests/{run-make => run-make-cargo}/compiler-builtins/Cargo.toml (100%) rename tests/{run-make => run-make-cargo}/compiler-builtins/lib.rs (100%) rename tests/{run-make => run-make-cargo}/compiler-builtins/rmake.rs (100%) rename tests/{run-make => run-make-cargo}/rustc-crates-on-stable/rmake.rs (100%) rename tests/{run-make => run-make-cargo}/rustdoc-scrape-examples-paths/foo/Cargo.toml (100%) rename tests/{run-make => run-make-cargo}/rustdoc-scrape-examples-paths/foo/examples/complex.rs (100%) rename tests/{run-make => run-make-cargo}/rustdoc-scrape-examples-paths/foo/examples/tester.rs (100%) rename tests/{run-make => run-make-cargo}/rustdoc-scrape-examples-paths/foo/src/lib.rs (100%) rename tests/{run-make => run-make-cargo}/rustdoc-scrape-examples-paths/rmake.rs (100%) rename tests/{run-make => run-make-cargo}/thumb-none-cortex-m/rmake.rs (100%) rename tests/{run-make => run-make-cargo}/thumb-none-qemu/example/.cargo/config.toml (100%) rename tests/{run-make => run-make-cargo}/thumb-none-qemu/example/Cargo.lock (100%) rename tests/{run-make => run-make-cargo}/thumb-none-qemu/example/Cargo.toml (100%) rename tests/{run-make => run-make-cargo}/thumb-none-qemu/example/memory.x (100%) rename tests/{run-make => run-make-cargo}/thumb-none-qemu/example/src/main.rs (100%) rename tests/{run-make => run-make-cargo}/thumb-none-qemu/rmake.rs (100%) rename tests/{run-make => run-make-cargo}/uefi-qemu/rmake.rs (100%) rename tests/{run-make => run-make-cargo}/uefi-qemu/uefi_qemu_test/Cargo.lock (100%) rename tests/{run-make => run-make-cargo}/uefi-qemu/uefi_qemu_test/Cargo.toml (100%) rename tests/{run-make => run-make-cargo}/uefi-qemu/uefi_qemu_test/src/main.rs (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_asm.checks (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_c.checks (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_c_asm.checks (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_cxx.checks (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_cxx_asm.checks (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_asm.checks (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c.checks (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c_asm.checks (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c_global_asm.checks (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx.checks (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx_asm.checks (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx_global_asm.checks (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/enclave/Cargo.toml (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/enclave/build.rs (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/enclave/foo.c (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/enclave/foo_asm.s (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/enclave/foo_cxx.cpp (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/CMakeLists.txt (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo.c (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo_asm.s (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo_cxx.cpp (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/enclave/src/main.rs (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/jumpto.checks (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/print.with_frame_pointers.checks (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/print.without_frame_pointers.checks (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/rmake.rs (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/rust_plus_one_global_asm.checks (100%) rename tests/{run-make => run-make-cargo}/x86_64-fortanix-unknown-sgx-lvi/unw_getcontext.checks (100%) diff --git a/tests/run-make/apple-slow-tls/rmake.rs b/tests/run-make-cargo/apple-slow-tls/rmake.rs similarity index 100% rename from tests/run-make/apple-slow-tls/rmake.rs rename to tests/run-make-cargo/apple-slow-tls/rmake.rs diff --git a/tests/run-make/apple-slow-tls/tls_test/Cargo.toml b/tests/run-make-cargo/apple-slow-tls/tls_test/Cargo.toml similarity index 100% rename from tests/run-make/apple-slow-tls/tls_test/Cargo.toml rename to tests/run-make-cargo/apple-slow-tls/tls_test/Cargo.toml diff --git a/tests/run-make/apple-slow-tls/tls_test/src/main.rs b/tests/run-make-cargo/apple-slow-tls/tls_test/src/main.rs similarity index 100% rename from tests/run-make/apple-slow-tls/tls_test/src/main.rs rename to tests/run-make-cargo/apple-slow-tls/tls_test/src/main.rs diff --git a/tests/run-make/compiler-builtins/Cargo.toml b/tests/run-make-cargo/compiler-builtins/Cargo.toml similarity index 100% rename from tests/run-make/compiler-builtins/Cargo.toml rename to tests/run-make-cargo/compiler-builtins/Cargo.toml diff --git a/tests/run-make/compiler-builtins/lib.rs b/tests/run-make-cargo/compiler-builtins/lib.rs similarity index 100% rename from tests/run-make/compiler-builtins/lib.rs rename to tests/run-make-cargo/compiler-builtins/lib.rs diff --git a/tests/run-make/compiler-builtins/rmake.rs b/tests/run-make-cargo/compiler-builtins/rmake.rs similarity index 100% rename from tests/run-make/compiler-builtins/rmake.rs rename to tests/run-make-cargo/compiler-builtins/rmake.rs diff --git a/tests/run-make/rustc-crates-on-stable/rmake.rs b/tests/run-make-cargo/rustc-crates-on-stable/rmake.rs similarity index 100% rename from tests/run-make/rustc-crates-on-stable/rmake.rs rename to tests/run-make-cargo/rustc-crates-on-stable/rmake.rs diff --git a/tests/run-make/rustdoc-scrape-examples-paths/foo/Cargo.toml b/tests/run-make-cargo/rustdoc-scrape-examples-paths/foo/Cargo.toml similarity index 100% rename from tests/run-make/rustdoc-scrape-examples-paths/foo/Cargo.toml rename to tests/run-make-cargo/rustdoc-scrape-examples-paths/foo/Cargo.toml diff --git a/tests/run-make/rustdoc-scrape-examples-paths/foo/examples/complex.rs b/tests/run-make-cargo/rustdoc-scrape-examples-paths/foo/examples/complex.rs similarity index 100% rename from tests/run-make/rustdoc-scrape-examples-paths/foo/examples/complex.rs rename to tests/run-make-cargo/rustdoc-scrape-examples-paths/foo/examples/complex.rs diff --git a/tests/run-make/rustdoc-scrape-examples-paths/foo/examples/tester.rs b/tests/run-make-cargo/rustdoc-scrape-examples-paths/foo/examples/tester.rs similarity index 100% rename from tests/run-make/rustdoc-scrape-examples-paths/foo/examples/tester.rs rename to tests/run-make-cargo/rustdoc-scrape-examples-paths/foo/examples/tester.rs diff --git a/tests/run-make/rustdoc-scrape-examples-paths/foo/src/lib.rs b/tests/run-make-cargo/rustdoc-scrape-examples-paths/foo/src/lib.rs similarity index 100% rename from tests/run-make/rustdoc-scrape-examples-paths/foo/src/lib.rs rename to tests/run-make-cargo/rustdoc-scrape-examples-paths/foo/src/lib.rs diff --git a/tests/run-make/rustdoc-scrape-examples-paths/rmake.rs b/tests/run-make-cargo/rustdoc-scrape-examples-paths/rmake.rs similarity index 100% rename from tests/run-make/rustdoc-scrape-examples-paths/rmake.rs rename to tests/run-make-cargo/rustdoc-scrape-examples-paths/rmake.rs diff --git a/tests/run-make/thumb-none-cortex-m/rmake.rs b/tests/run-make-cargo/thumb-none-cortex-m/rmake.rs similarity index 100% rename from tests/run-make/thumb-none-cortex-m/rmake.rs rename to tests/run-make-cargo/thumb-none-cortex-m/rmake.rs diff --git a/tests/run-make/thumb-none-qemu/example/.cargo/config.toml b/tests/run-make-cargo/thumb-none-qemu/example/.cargo/config.toml similarity index 100% rename from tests/run-make/thumb-none-qemu/example/.cargo/config.toml rename to tests/run-make-cargo/thumb-none-qemu/example/.cargo/config.toml diff --git a/tests/run-make/thumb-none-qemu/example/Cargo.lock b/tests/run-make-cargo/thumb-none-qemu/example/Cargo.lock similarity index 100% rename from tests/run-make/thumb-none-qemu/example/Cargo.lock rename to tests/run-make-cargo/thumb-none-qemu/example/Cargo.lock diff --git a/tests/run-make/thumb-none-qemu/example/Cargo.toml b/tests/run-make-cargo/thumb-none-qemu/example/Cargo.toml similarity index 100% rename from tests/run-make/thumb-none-qemu/example/Cargo.toml rename to tests/run-make-cargo/thumb-none-qemu/example/Cargo.toml diff --git a/tests/run-make/thumb-none-qemu/example/memory.x b/tests/run-make-cargo/thumb-none-qemu/example/memory.x similarity index 100% rename from tests/run-make/thumb-none-qemu/example/memory.x rename to tests/run-make-cargo/thumb-none-qemu/example/memory.x diff --git a/tests/run-make/thumb-none-qemu/example/src/main.rs b/tests/run-make-cargo/thumb-none-qemu/example/src/main.rs similarity index 100% rename from tests/run-make/thumb-none-qemu/example/src/main.rs rename to tests/run-make-cargo/thumb-none-qemu/example/src/main.rs diff --git a/tests/run-make/thumb-none-qemu/rmake.rs b/tests/run-make-cargo/thumb-none-qemu/rmake.rs similarity index 100% rename from tests/run-make/thumb-none-qemu/rmake.rs rename to tests/run-make-cargo/thumb-none-qemu/rmake.rs diff --git a/tests/run-make/uefi-qemu/rmake.rs b/tests/run-make-cargo/uefi-qemu/rmake.rs similarity index 100% rename from tests/run-make/uefi-qemu/rmake.rs rename to tests/run-make-cargo/uefi-qemu/rmake.rs diff --git a/tests/run-make/uefi-qemu/uefi_qemu_test/Cargo.lock b/tests/run-make-cargo/uefi-qemu/uefi_qemu_test/Cargo.lock similarity index 100% rename from tests/run-make/uefi-qemu/uefi_qemu_test/Cargo.lock rename to tests/run-make-cargo/uefi-qemu/uefi_qemu_test/Cargo.lock diff --git a/tests/run-make/uefi-qemu/uefi_qemu_test/Cargo.toml b/tests/run-make-cargo/uefi-qemu/uefi_qemu_test/Cargo.toml similarity index 100% rename from tests/run-make/uefi-qemu/uefi_qemu_test/Cargo.toml rename to tests/run-make-cargo/uefi-qemu/uefi_qemu_test/Cargo.toml diff --git a/tests/run-make/uefi-qemu/uefi_qemu_test/src/main.rs b/tests/run-make-cargo/uefi-qemu/uefi_qemu_test/src/main.rs similarity index 100% rename from tests/run-make/uefi-qemu/uefi_qemu_test/src/main.rs rename to tests/run-make-cargo/uefi-qemu/uefi_qemu_test/src/main.rs diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_asm.checks b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_asm.checks similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_asm.checks rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_asm.checks diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_c.checks b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_c.checks similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_c.checks rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_c.checks diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_c_asm.checks b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_c_asm.checks similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_c_asm.checks rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_c_asm.checks diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_cxx.checks b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_cxx.checks similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_cxx.checks rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_cxx.checks diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_cxx_asm.checks b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_cxx_asm.checks similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_cxx_asm.checks rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cc_plus_one_cxx_asm.checks diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_asm.checks b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_asm.checks similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_asm.checks rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_asm.checks diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c.checks b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c.checks similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c.checks rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c.checks diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c_asm.checks b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c_asm.checks similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c_asm.checks rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c_asm.checks diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c_global_asm.checks b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c_global_asm.checks similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c_global_asm.checks rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_c_global_asm.checks diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx.checks b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx.checks similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx.checks rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx.checks diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx_asm.checks b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx_asm.checks similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx_asm.checks rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx_asm.checks diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx_global_asm.checks b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx_global_asm.checks similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx_global_asm.checks rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/cmake_plus_one_cxx_global_asm.checks diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/Cargo.toml b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/enclave/Cargo.toml similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/Cargo.toml rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/enclave/Cargo.toml diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/build.rs b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/enclave/build.rs similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/build.rs rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/enclave/build.rs diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/foo.c b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/enclave/foo.c similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/foo.c rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/enclave/foo.c diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/foo_asm.s b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/enclave/foo_asm.s similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/foo_asm.s rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/enclave/foo_asm.s diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/foo_cxx.cpp b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/enclave/foo_cxx.cpp similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/foo_cxx.cpp rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/enclave/foo_cxx.cpp diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/CMakeLists.txt b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/CMakeLists.txt similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/CMakeLists.txt rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/CMakeLists.txt diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo.c b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo.c similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo.c rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo.c diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo_asm.s b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo_asm.s similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo_asm.s rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo_asm.s diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo_cxx.cpp b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo_cxx.cpp similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo_cxx.cpp rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo_cxx.cpp diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/src/main.rs b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/enclave/src/main.rs similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/src/main.rs rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/enclave/src/main.rs diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/jumpto.checks b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/jumpto.checks similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/jumpto.checks rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/jumpto.checks diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/print.with_frame_pointers.checks b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/print.with_frame_pointers.checks similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/print.with_frame_pointers.checks rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/print.with_frame_pointers.checks diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/print.without_frame_pointers.checks b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/print.without_frame_pointers.checks similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/print.without_frame_pointers.checks rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/print.without_frame_pointers.checks diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/rmake.rs b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/rmake.rs similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/rmake.rs rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/rmake.rs diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/rust_plus_one_global_asm.checks b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/rust_plus_one_global_asm.checks similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/rust_plus_one_global_asm.checks rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/rust_plus_one_global_asm.checks diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/unw_getcontext.checks b/tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/unw_getcontext.checks similarity index 100% rename from tests/run-make/x86_64-fortanix-unknown-sgx-lvi/unw_getcontext.checks rename to tests/run-make-cargo/x86_64-fortanix-unknown-sgx-lvi/unw_getcontext.checks