update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / test / unit / lib / nvme / nvme_quirks.c / nvme_quirks_ut.c

diff --git a/ceph/src/spdk/test/unit/lib/nvme/nvme_quirks.c/nvme_quirks_ut.c b/ceph/src/spdk/test/unit/lib/nvme/nvme_quirks.c/nvme_quirks_ut.c
index 95fdd14382a5a11d7dd3ecf1af5e0bcfb2209571..c3e799251bf4e761010bd21b1cba9a7a82f84e50 100644 (file)
--- a/ceph/src/spdk/test/unit/lib/nvme/nvme_quirks.c/nvme_quirks_ut.c
+++ b/ceph/src/spdk/test/unit/lib/nvme/nvme_quirks.c/nvme_quirks_ut.c
@@ -48,6 +48,7 @@ test_nvme_quirks_striping(void)
        CU_ASSERT((quirks & NVME_INTEL_QUIRK_STRIPING) == 0);
 
        /* Set the vendor id to Intel, but no device id. No striping. */
+       pci_id.class_id = SPDK_PCI_CLASS_NVME;
        pci_id.vendor_id = SPDK_PCI_VID_INTEL;
        quirks = nvme_get_quirks(&pci_id);
        CU_ASSERT((quirks & NVME_INTEL_QUIRK_STRIPING) == 0);
@@ -76,23 +77,12 @@ int 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("nvme_quirks", NULL, NULL);
-       if (suite == NULL) {
-               CU_cleanup_registry();
-               return CU_get_error();
-       }
 
-       if (
-               CU_add_test(suite, "test nvme_quirks striping",
-                           test_nvme_quirks_striping) == NULL
-       ) {
-               CU_cleanup_registry();
-               return CU_get_error();
-       }
+       CU_ADD_TEST(suite, test_nvme_quirks_striping);
 
        CU_basic_set_mode(CU_BRM_VERBOSE);
        CU_basic_run_tests();