Commit ea941cae authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

test/unit: use spdk_ut_run_tests() 



Replaced direct calls to the CUnit's functions to run the tests with
spdk_ut_run_tests().  That way, each test will have the ability to run
a specific test case.

The blob.c unit test wasn't changed, because it runs all tests multiple
times with different parameter combinations, so it cannot be easily
converted.  In the future, each such combination could be split into a
separate test suite, which would make it compatible with
spdk_ut_run_tests().

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I4463f808f89844e9bf32b5b31eda197c5d729d1d
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/19288


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent f1167cb5

mk/spdk.unittest.mk

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ CFLAGS += -ffunction-sections 
CFLAGS += -DSPDK_UNIT_TEST=1

LDFLAGS += -Wl,--gc-sections



SPDK_LIB_LIST += thread trace util log

SPDK_LIB_LIST += thread trace util log ut



LIBS += -lcunit $(SPDK_STATIC_LIB_LINKER_ARGS)

test/unit/include/spdk/histogram_data.h/histogram_ut.c

+1 −3
Original line number Diff line number Diff line
@@ -136,9 +136,7 @@ main(int argc, char **argv) 
		return CU_get_error();

	}



	CU_basic_set_mode(CU_BRM_VERBOSE);

	CU_basic_run_tests();

	num_failures = CU_get_number_of_failures();

	num_failures = spdk_ut_run_tests(argc, argv, NULL);

	CU_cleanup_registry();

	return num_failures;

}

test/unit/lib/accel/accel.c/accel_ut.c

+1 −4
Original line number Diff line number Diff line
@@ -4123,7 +4123,6 @@ main(int argc, char **argv) 
	CU_pSuite	suite = NULL, seq_suite;

	unsigned int	num_failures;



	CU_set_error_action(CUEA_ABORT);

	CU_initialize_registry();



	/* Sequence tests require accel to be initialized normally, so run them before the other
@@ -4164,9 +4163,7 @@ main(int argc, char **argv) 
	CU_ADD_TEST(suite, test_spdk_accel_module_find_by_name);

	CU_ADD_TEST(suite, test_spdk_accel_module_register);



	CU_basic_set_mode(CU_BRM_VERBOSE);

	CU_basic_run_tests();

	num_failures = CU_get_number_of_failures();

	num_failures = spdk_ut_run_tests(argc, argv, NULL);

	CU_cleanup_registry();



	return num_failures;

test/unit/lib/accel/dpdk_compressdev.c/accel_dpdk_compressdev_ut.c

+1 −4
Original line number Diff line number Diff line
@@ -1039,7 +1039,6 @@ main(int argc, char **argv) 
	CU_pSuite	suite = NULL;

	unsigned int	num_failures;



	CU_set_error_action(CUEA_ABORT);

	CU_initialize_registry();



	suite = CU_add_suite("compress", test_setup, test_cleanup);
@@ -1049,9 +1048,7 @@ main(int argc, char **argv) 
	CU_ADD_TEST(suite, test_initdrivers);

	CU_ADD_TEST(suite, test_poller);



	CU_basic_set_mode(CU_BRM_VERBOSE);

	CU_basic_run_tests();

	num_failures = CU_get_number_of_failures();

	num_failures = spdk_ut_run_tests(argc, argv, NULL);

	CU_cleanup_registry();

	return num_failures;

}

test/unit/lib/accel/dpdk_cryptodev.c/accel_dpdk_cryptodev_ut.c

+1 −4
Original line number Diff line number Diff line
@@ -1555,7 +1555,6 @@ main(int argc, char **argv) 
	CU_pSuite	suite = NULL;

	unsigned int	num_failures;



	CU_set_error_action(CUEA_ABORT);

	CU_initialize_registry();



	suite = CU_add_suite("dpdk_cryptodev", test_setup, test_cleanup);
@@ -1570,9 +1569,7 @@ main(int argc, char **argv) 
	CU_ADD_TEST(suite, test_poller);

	CU_ADD_TEST(suite, test_assign_device_qp);



	CU_basic_set_mode(CU_BRM_VERBOSE);

	CU_basic_run_tests();

	num_failures = CU_get_number_of_failures();

	num_failures = spdk_ut_run_tests(argc, argv, NULL);

	CU_cleanup_registry();

	return num_failures;

}