rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass extra testing script flags as cargo flags.

This commit is contained in:
Sergio Benitez 2021-03-08 19:04:18 -08:00
parent 83ffe0f7bc
commit fd8af3a2c5
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/test.sh
View File

@ -59,10 +59,19 @@ if [[ $1 == +* ]]; then
shift shift
fi fi
# The kind of test we'll be running.
TEST_KIND="all"
if [[ "$1" == "--contrib" ]] || [[ "$1" == "--core" ]]; then
TEST_KIND=${1#"--"}
shift
fi
echo ":: Preparing. Environment is..." echo ":: Preparing. Environment is..."
print_environment print_environment
echo " CARGO: $CARGO" echo " CARGO: $CARGO"
echo " RUSTFLAGS: $RUSTFLAGS" echo " RUSTFLAGS: $RUSTFLAGS"
echo " EXTRA FLAGS: $@"
echo ":: Ensuring all crate versions match..." echo ":: Ensuring all crate versions match..."
check_versions_match "${ALL_PROJECT_DIRS[@]}" check_versions_match "${ALL_PROJECT_DIRS[@]}"
@ -78,7 +87,7 @@ if ! $CARGO update ; then
echo " WARNING: Update failed! Proceeding with possibly outdated deps..." echo " WARNING: Update failed! Proceeding with possibly outdated deps..."
fi fi
if [ "$1" = "--contrib" ]; then if [ $TEST_KIND = "contrib" ]; then
FEATURES=( FEATURES=(
json json
msgpack msgpack
@ -100,15 +109,15 @@ if [ "$1" = "--contrib" ]; then
pushd "${CONTRIB_LIB_ROOT}" > /dev/null 2>&1 pushd "${CONTRIB_LIB_ROOT}" > /dev/null 2>&1
echo ":: Building and testing contrib [default]..." echo ":: Building and testing contrib [default]..."
$CARGO test $CARGO test $@
for feature in "${FEATURES[@]}"; do for feature in "${FEATURES[@]}"; do
echo ":: Building and testing contrib [${feature}]..." echo ":: Building and testing contrib [${feature}]..."
$CARGO test --no-default-features --features "${feature}" $CARGO test --no-default-features --features "${feature}" $@
done done
popd > /dev/null 2>&1 popd > /dev/null 2>&1
elif [ "$1" = "--core" ]; then elif [ $TEST_KIND = "core" ]; then
FEATURES=( FEATURES=(
secrets secrets
tls tls
@ -117,11 +126,11 @@ elif [ "$1" = "--core" ]; then
pushd "${CORE_LIB_ROOT}" > /dev/null 2>&1 pushd "${CORE_LIB_ROOT}" > /dev/null 2>&1
echo ":: Building and testing core [no features]..." echo ":: Building and testing core [no features]..."
$CARGO test --no-default-features $CARGO test --no-default-features $@
for feature in "${FEATURES[@]}"; do for feature in "${FEATURES[@]}"; do
echo ":: Building and testing core [${feature}]..." echo ":: Building and testing core [${feature}]..."
$CARGO test --no-default-features --features "${feature}" $CARGO test --no-default-features --features "${feature}" $@
done done
popd > /dev/null 2>&1 popd > /dev/null 2>&1