New upstream version 18.08
[deb_dpdk.git] / app / test-bbdev / test_bbdev.c
index 10579ea..a914817 100644 (file)
@@ -273,7 +273,7 @@ test_bbdev_configure_stop_queue(void)
 
        /* Valid queue configuration */
        ts_params->qconf.queue_size = info.drv.queue_size_lim;
-       ts_params->qconf.priority = info.drv.max_queue_priority;
+       ts_params->qconf.priority = info.drv.max_ul_queue_priority;
 
        /* Device - started; queue - started */
        rte_bbdev_start(dev_id);
@@ -413,14 +413,7 @@ test_bbdev_configure_invalid_queue_configure(void)
                        ts_params->qconf.queue_size);
 
        ts_params->qconf.queue_size = info.drv.queue_size_lim;
-       ts_params->qconf.priority = info.drv.max_queue_priority + 1;
-       TEST_ASSERT_FAIL(rte_bbdev_queue_configure(dev_id, queue_id,
-                       &ts_params->qconf),
-                       "Failed test for rte_bbdev_queue_configure: "
-                       "invalid value qconf.queue_size: %u",
-                       ts_params->qconf.queue_size);
-
-       ts_params->qconf.priority = info.drv.max_queue_priority;
+       ts_params->qconf.priority = info.drv.max_ul_queue_priority;
        queue_id = info.num_queues;
        TEST_ASSERT_FAIL(rte_bbdev_queue_configure(dev_id, queue_id,
                        &ts_params->qconf),
@@ -902,12 +895,12 @@ test_bbdev_callback(void)
                        "Failed to callback rgstr for RTE_BBDEV_EVENT_UNKNOWN");
 
        rte_bbdev_pmd_callback_process(dev1, RTE_BBDEV_EVENT_UNKNOWN, NULL);
-       TEST_ASSERT(event_status == 0,
+       TEST_ASSERT(event_status == (int) RTE_BBDEV_EVENT_UNKNOWN,
                        "Failed test for rte_bbdev_pmd_callback_process "
                        "for RTE_BBDEV_EVENT_UNKNOWN ");
 
        rte_bbdev_pmd_callback_process(dev1, RTE_BBDEV_EVENT_ERROR, NULL);
-       TEST_ASSERT(event_status == 0,
+       TEST_ASSERT(event_status == (int) RTE_BBDEV_EVENT_UNKNOWN,
                        "Failed test for rte_bbdev_pmd_callback_process: "
                        "event RTE_BBDEV_EVENT_ERROR was not registered ");
 
@@ -926,12 +919,12 @@ test_bbdev_callback(void)
 
        event_status = -1;
        rte_bbdev_pmd_callback_process(dev1, RTE_BBDEV_EVENT_UNKNOWN, NULL);
-       TEST_ASSERT(event_status == 0,
+       TEST_ASSERT(event_status == (int) RTE_BBDEV_EVENT_UNKNOWN,
                        "Failed test for rte_bbdev_pmd_callback_process "
                        "for RTE_BBDEV_EVENT_UNKNOWN ");
 
        rte_bbdev_pmd_callback_process(dev1, RTE_BBDEV_EVENT_ERROR, NULL);
-       TEST_ASSERT(event_status == 1,
+       TEST_ASSERT(event_status == (int) RTE_BBDEV_EVENT_ERROR,
                        "Failed test for rte_bbdev_pmd_callback_process "
                        "for RTE_BBDEV_EVENT_ERROR ");
 
@@ -945,12 +938,12 @@ test_bbdev_callback(void)
 
        event_status = -1;
        rte_bbdev_pmd_callback_process(dev1, RTE_BBDEV_EVENT_UNKNOWN, NULL);
-       TEST_ASSERT(event_status == 0,
+       TEST_ASSERT(event_status == (int) RTE_BBDEV_EVENT_UNKNOWN,
                        "Failed test for rte_bbdev_pmd_callback_process "
                        "for RTE_BBDEV_EVENT_UNKNOWN ");
 
        rte_bbdev_pmd_callback_process(dev1, RTE_BBDEV_EVENT_ERROR, NULL);
-       TEST_ASSERT(event_status == 0,
+       TEST_ASSERT(event_status == (int) RTE_BBDEV_EVENT_UNKNOWN,
                        "Failed test for rte_bbdev_pmd_callback_process: "
                        "event RTE_BBDEV_EVENT_ERROR was unregistered ");
 
@@ -999,7 +992,7 @@ test_bbdev_callback(void)
                "for RTE_BBDEV_EVENT_ERROR ");
 
        rte_bbdev_pmd_callback_process(dev2, RTE_BBDEV_EVENT_ERROR, NULL);
-       TEST_ASSERT(event_status == 1,
+       TEST_ASSERT(event_status == (int) RTE_BBDEV_EVENT_ERROR,
                "Failed test for rte_bbdev_pmd_callback_process in dev2 "
                "for RTE_BBDEV_EVENT_ERROR ");
 
@@ -1013,7 +1006,7 @@ test_bbdev_callback(void)
                        "in dev 2 ");
 
        rte_bbdev_pmd_callback_process(dev2, RTE_BBDEV_EVENT_UNKNOWN, NULL);
-       TEST_ASSERT(event_status == 0,
+       TEST_ASSERT(event_status == (int) RTE_BBDEV_EVENT_UNKNOWN,
                        "Failed test for rte_bbdev_pmd_callback_process in dev2"
                        " for RTE_BBDEV_EVENT_UNKNOWN ");
 
@@ -1033,7 +1026,7 @@ test_bbdev_callback(void)
                " for RTE_BBDEV_EVENT_UNKNOWN ");
 
        rte_bbdev_pmd_callback_process(dev1, RTE_BBDEV_EVENT_UNKNOWN, NULL);
-       TEST_ASSERT(event_status == 0,
+       TEST_ASSERT(event_status == (int) RTE_BBDEV_EVENT_UNKNOWN,
                        "Failed test for rte_bbdev_pmd_callback_process in dev2 "
                        "for RTE_BBDEV_EVENT_UNKNOWN ");