diff --git a/scripts/run_integration_tests_aarch64.sh b/scripts/run_integration_tests_aarch64.sh index cf4d0b573..7394a36e4 100755 --- a/scripts/run_integration_tests_aarch64.sh +++ b/scripts/run_integration_tests_aarch64.sh @@ -250,13 +250,13 @@ echo 6144 | sudo tee /proc/sys/vm/nr_hugepages sudo chmod a+rwX /dev/hugepages # Run all direct kernel boot (Device Tree) test cases in mod `parallel` -time cargo test $features "parallel::$test_filter" --target $BUILD_TARGET -- ${test_binary_args[*]} +time cargo test $features "common_parallel::$test_filter" --target $BUILD_TARGET -- ${test_binary_args[*]} RES=$? # Run some tests in sequence since the result could be affected by other tests # running in parallel. if [ $RES -eq 0 ]; then - time cargo test $features "sequential::$test_filter" --target $BUILD_TARGET -- --test-threads=1 ${test_binary_args[*]} + time cargo test $features "common_sequential::$test_filter" --target $BUILD_TARGET -- --test-threads=1 ${test_binary_args[*]} RES=$? else exit $RES diff --git a/scripts/run_integration_tests_x86_64.sh b/scripts/run_integration_tests_x86_64.sh index d181b29e1..5ad8b9106 100755 --- a/scripts/run_integration_tests_x86_64.sh +++ b/scripts/run_integration_tests_x86_64.sh @@ -195,14 +195,14 @@ sudo chmod a+rwX /dev/hugepages ulimit -l unlimited export RUST_BACKTRACE=1 -time cargo test $features "parallel::$test_filter" -- ${test_binary_args[*]} +time cargo test $features "common_parallel::$test_filter" -- ${test_binary_args[*]} RES=$? # Run some tests in sequence since the result could be affected by other tests # running in parallel. if [ $RES -eq 0 ]; then export RUST_BACKTRACE=1 - time cargo test $features "sequential::$test_filter" -- --test-threads=1 ${test_binary_args[*]} + time cargo test $features "common_sequential::$test_filter" -- --test-threads=1 ${test_binary_args[*]} RES=$? fi diff --git a/tests/integration.rs b/tests/integration.rs index 86876d25e..fb8e4ff5d 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -1950,7 +1950,7 @@ fn check_guest_watchdog_one_reboot( } } -mod parallel { +mod common_parallel { use std::{fs::OpenOptions, io::SeekFrom}; use crate::*; @@ -6786,7 +6786,7 @@ mod parallel { } } -mod sequential { +mod common_sequential { use crate::*; #[test]