From 8b47b31a1798311c7a015e316a069cbf8563a943 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Wed, 22 Jan 2020 15:36:27 -0700 Subject: [PATCH] test/unit: clean up conditional checks and duplicate tests Change-Id: Ibd99f40f19e73b119ff7de434a4ddf9a29ed3191 Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/482444 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto Community-CI: SPDK CI Jenkins --- test/unit/unittest.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/test/unit/unittest.sh b/test/unit/unittest.sh index 144eb8007..2dc04623e 100755 --- a/test/unit/unittest.sh +++ b/test/unit/unittest.sh @@ -152,15 +152,15 @@ fi run_test "unittest_include" $valgrind $testdir/include/spdk/histogram_data.h/histogram_ut run_test "unittest_bdev" unittest_bdev -if grep -q '#define SPDK_CONFIG_CRYPTO 1' $rootdir/include/spdk/config.h; then +if [ $SPDK_TEST_CRYPTO -eq 1 ]; then run_test "unittest_bdev_crypto" $valgrind $testdir/lib/bdev/crypto.c/crypto_ut fi -if grep -q '#define SPDK_CONFIG_REDUCE 1' $rootdir/include/spdk/config.h; then +if [ $SPDK_TEST_REDUCE -eq 1 ]; then run_test "unittest_bdev_reduce" $valgrind $testdir/lib/bdev/compress.c/compress_ut fi -if grep -q '#define SPDK_CONFIG_PMDK 1' $rootdir/include/spdk/config.h; then +if [ $SPDK_TEST_PMDK -eq 1 ]; then run_test "unittest_bdev_pmem" $valgrind $testdir/lib/bdev/pmem/bdev_pmem_ut fi @@ -194,10 +194,6 @@ if grep -q '#define SPDK_CONFIG_RDMA 1' $rootdir/include/spdk/config.h; then run_test "unittest_nvmf_rdma" $valgrind $testdir/lib/nvmf/rdma.c/rdma_ut fi -if grep -q '#define SPDK_CONFIG_REDUCE 1' $rootdir/config.h; then - run_test "unittest_bdev_reduce" $valgrind $testdir/lib/reduce/reduce.c/reduce_ut -fi - run_test "unittest_scsi" unittest_scsi run_test "unittest_sock" $valgrind $testdir/lib/sock/sock.c/sock_ut run_test "unittest_thread" $valgrind $testdir/lib/thread/thread.c/thread_ut