update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / test / unit / lib / scsi / scsi.c / scsi_ut.c

diff --git a/ceph/src/spdk/test/unit/lib/scsi/scsi.c/scsi_ut.c b/ceph/src/spdk/test/unit/lib/scsi/scsi.c/scsi_ut.c
index 5a1a31f6a0260e0c5dea36faad80a34c59289ea2..430ff96b0264ba1eba4a0e4de3d5dcb48a7538e5 100644 (file)
--- a/ceph/src/spdk/test/unit/lib/scsi/scsi.c/scsi_ut.c
+++ b/ceph/src/spdk/test/unit/lib/scsi/scsi.c/scsi_ut.c
@@ -54,23 +54,12 @@ main(int argc, char **argv)
        CU_pSuite       suite = NULL;
        unsigned int    num_failures;
 
-       if (CU_initialize_registry() != CUE_SUCCESS) {
-               return CU_get_error();
-       }
+       CU_set_error_action(CUEA_ABORT);
+       CU_initialize_registry();
 
        suite = CU_add_suite("scsi_suite", NULL, NULL);
-       if (suite == NULL) {
-               CU_cleanup_registry();
-               return CU_get_error();
-       }
 
-       if (
-               CU_add_test(suite, "scsi init", \
-                           scsi_init) == NULL
-       ) {
-               CU_cleanup_registry();
-               return CU_get_error();
-       }
+       CU_ADD_TEST(suite, scsi_init);
 
        CU_basic_set_mode(CU_BRM_VERBOSE);
        CU_basic_run_tests();