scripts: dev_cli: Pass unit and integration test args to cargo test

In order, among other things, to use the development CLI to run specific
integration tests. For example, to run only the memory_overhead
integration test:

./scripts/dev_cli.sh tests --integration -- memory_overhead

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2020-02-04 14:49:21 +01:00
parent bc053f1b13
commit 705f27151d
3 changed files with 6 additions and 6 deletions

View File

@ -124,7 +124,7 @@ cmd_help() {
echo " --debug Build the debug binaries. This is the default."
echo " --release Build the release binaries."
echo ""
echo " tests [--unit|--cargo|--all]"
echo " tests [--unit|--cargo|--all] [-- [<cargo test args>]]"
echo " Run the Cloud Hypervisor tests."
echo " --unit Run the unit tests."
echo " --cargo Run the cargo tests."
@ -227,7 +227,7 @@ cmd_tests() {
--volume /dev:/dev \
--volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" \
"$CTR_IMAGE" \
./scripts/run_unit_tests.sh
./scripts/run_unit_tests.sh "$@"
fi
if [ "$cargo" = true ] ; then
@ -252,7 +252,7 @@ cmd_tests() {
--volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" \
--volume "$CLH_INTEGRATION_WORKLOADS:$CTR_CLH_INTEGRATION_WORKLOADS" \
"$CTR_IMAGE" \
./scripts/run_integration_tests.sh
./scripts/run_integration_tests.sh "$@"
fi
}

View File

@ -177,7 +177,7 @@ ls target/debug/deps/cloud_hypervisor-* | xargs -n 1 sudo setcap cap_net_admin+e
sudo adduser $USER kvm
newgrp kvm << EOF
export RUST_BACKTRACE=1
time cargo test --features "integration_tests" -- --nocapture
time cargo test --features "integration_tests" "$@" -- --nocapture
EOF
RES=$?
@ -188,7 +188,7 @@ if [ $RES -eq 0 ]; then
newgrp kvm << EOF
export RUST_BACKTRACE=1
time cargo test --features "integration_tests,mmio" -- --nocapture
time cargo test --features "integration_tests,mmio" "$@" -- --nocapture
EOF
RES=$?

View File

@ -10,5 +10,5 @@ popd
sudo adduser $USER kvm
newgrp kvm << EOF || exit 1
export RUST_BACKTRACE=1
cargo test --workspace || exit 1;
cargo test --workspace "$@" || exit 1;
EOF