External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-02-08 12:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Avoid name clashing for 'parallel/sequential' tests

Browse Source 
Add prefix 'common_' to make them more specific.

Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
Bo Chen 2022-08-16 11:42:28 -07:00 committed by Rob Bradford
parent 25f815e7d1
commit 1f70d16c12
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/run_integration_tests_aarch64.sh
View File

@ -250,13 +250,13 @@ echo 6144 | sudo tee /proc/sys/vm/nr_hugepages
sudo chmod a+rwX /dev/hugepages sudo chmod a+rwX /dev/hugepages
# Run all direct kernel boot (Device Tree) test cases in mod `parallel` # 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=$? RES=$?
# Run some tests in sequence since the result could be affected by other tests # Run some tests in sequence since the result could be affected by other tests
# running in parallel. # running in parallel.
if [ $RES -eq 0 ]; then 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=$? RES=$?
else else
exit $RES exit $RES

4
scripts/run_integration_tests_x86_64.sh
View File

@ -195,14 +195,14 @@ sudo chmod a+rwX /dev/hugepages
ulimit -l unlimited ulimit -l unlimited
export RUST_BACKTRACE=1 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=$? RES=$?
# Run some tests in sequence since the result could be affected by other tests # Run some tests in sequence since the result could be affected by other tests
# running in parallel. # running in parallel.
if [ $RES -eq 0 ]; then if [ $RES -eq 0 ]; then
export RUST_BACKTRACE=1 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=$? RES=$?
fi fi

4
tests/integration.rs
View File

@ -1950,7 +1950,7 @@ fn check_guest_watchdog_one_reboot(
} }
} }
mod parallel { mod common_parallel {
use std::{fs::OpenOptions, io::SeekFrom}; use std::{fs::OpenOptions, io::SeekFrom};
use crate::*; use crate::*;
@ -6786,7 +6786,7 @@ mod parallel {
} }
} }
mod sequential { mod common_sequential {
use crate::*; use crate::*;
#[test] #[test]