diff --git a/etc/autobuild/ab3_defcfg.sh b/etc/autobuild/ab3_defcfg.sh index fca043f..b62728c 100644 --- a/etc/autobuild/ab3_defcfg.sh +++ b/etc/autobuild/ab3_defcfg.sh @@ -68,6 +68,7 @@ ABTEST_AUTO_DETECT=yes ABTEST_ABORT_BUILD=yes ABTEST_TESTEXEC=plain ABTEST_AUTO_DETECT_STAGE=post-build +ABTESTTYPE_rust_STAGE=post-build NOTEST=no ##OS Directory Tree diff --git a/lib/tests.sh b/lib/tests.sh index 07bf658..e54d0dd 100644 --- a/lib/tests.sh +++ b/lib/tests.sh @@ -120,9 +120,9 @@ abtest_gen_default() { ABTEST_default_TESTEXEC=$ABTEST_TESTEXEC ABTEST_default_TESTDES="Automatically generated tests for $ABTYPE" case $ABTYPE in - cargo) + rust) abinfo "Found cargo project, using cargo test as default test ..." - ABTEST_default_TESTTYPE=cargo + ABTEST_default_TESTTYPE=rust ABTEST_default_CARGO_TEST_AFTER="$CARGO_TEST_AFTER" ;; *) diff --git a/proc/10-tests_scan.sh b/proc/10-tests_scan.sh index 7a29e28..b3fbecc 100644 --- a/proc/10-tests_scan.sh +++ b/proc/10-tests_scan.sh @@ -6,7 +6,6 @@ if bool $NOTEST; then ABTESTS="" TESTDEP="" # Empty TESTDEPS by explicitly override it else - abinfo "Currently enabled tests are: $ABTESTS" abrequire tests export ABTEST_RESULT_OUTPUT="$SRCDIR/abtestoutput.txt" echo -n "" > "$ABTEST_RESULT_OUTPUT" diff --git a/proc/31-tests_probe.sh b/proc/31-tests_probe.sh index 89b9339..f2cebfc 100644 --- a/proc/31-tests_probe.sh +++ b/proc/31-tests_probe.sh @@ -7,3 +7,5 @@ if bool $ABTEST_AUTO_DETECT; then ABTESTS="$ABTESTS default" fi fi + +abinfo "Currently enabled tests are: $ABTESTS" diff --git a/tests/cargo.sh b/tests/rust.sh similarity index 62% rename from tests/cargo.sh rename to tests/rust.sh index d7dbbd0..ed2e35a 100644 --- a/tests/cargo.sh +++ b/tests/rust.sh @@ -1,7 +1,7 @@ -abtest_cargo_run() { +abtest_rust_test() { abinfo "Running cargo test ..." cargo test \ - --path "$SRCDIR/Cargo.toml" \ + --manifest-path "$SRCDIR/Cargo.toml" \ --no-fail-fast -r \ ${CARGO_TEST_AFTER} }