acl: fix build and runtime for default target

[dpdk.git] / app / test / test_acl.c

diff --git a/app/test/test_acl.c b/app/test/test_acl.c
index 869f6d3..356d620 100644 (file)
--- a/app/test/test_acl.c
+++ b/app/test/test_acl.c
@@ -36,8 +36,6 @@
 
 #include "test.h"
 
-#ifdef RTE_LIBRTE_ACL
-
 #include <rte_string_fns.h>
 #include <rte_mbuf.h>
 #include <rte_byteorder.h>
@@ -148,8 +146,9 @@ test_classify_run(struct rte_acl_ctx *acx)
        }
 
        /* make a quick check for scalar */
-       ret = rte_acl_classify_scalar(acx, data, results,
-                       RTE_DIM(acl_test_data), RTE_ACL_MAX_CATEGORIES);
+       ret = rte_acl_classify_alg(acx, data, results,
+                       RTE_DIM(acl_test_data), RTE_ACL_MAX_CATEGORIES,
+                       RTE_ACL_CLASSIFY_SCALAR);
        if (ret != 0) {
                printf("Line %i: SSE classify failed!\n", __LINE__);
                goto err;
@@ -343,8 +342,8 @@ test_invalid_layout(void)
        }
 
        /* classify tuples */
-       ret = rte_acl_classify(acx, data, results,
-                       RTE_DIM(results), 1);
+       ret = rte_acl_classify_alg(acx, data, results,
+                       RTE_DIM(results), 1, RTE_ACL_CLASSIFY_SCALAR);
        if (ret != 0) {
                printf("Line %i: SSE classify failed!\n", __LINE__);
                rte_acl_free(acx);
@@ -362,8 +361,9 @@ test_invalid_layout(void)
        }
 
        /* classify tuples (scalar) */
-       ret = rte_acl_classify_scalar(acx, data, results,
-                       RTE_DIM(results), 1);
+       ret = rte_acl_classify_alg(acx, data, results, RTE_DIM(results), 1,
+               RTE_ACL_CLASSIFY_SCALAR);
+
        if (ret != 0) {
                printf("Line %i: Scalar classify failed!\n", __LINE__);
                rte_acl_free(acx);
@@ -850,7 +850,8 @@ test_invalid_parameters(void)
        /* scalar classify test */
 
        /* cover zero categories in classify (should not fail) */
-       result = rte_acl_classify_scalar(acx, NULL, NULL, 0, 0);
+       result = rte_acl_classify_alg(acx, NULL, NULL, 0, 0,
+               RTE_ACL_CLASSIFY_SCALAR);
        if (result != 0) {
                printf("Line %i: Scalar classify with zero categories "
                                "failed!\n", __LINE__);
@@ -859,7 +860,7 @@ test_invalid_parameters(void)
        }
 
        /* cover invalid but positive categories in classify */
-       result = rte_acl_classify_scalar(acx, NULL, NULL, 0, 3);
+       result = rte_acl_classify(acx, NULL, NULL, 0, 3);
        if (result == 0) {
                printf("Line %i: Scalar classify with 3 categories "
                                "should have failed!\n", __LINE__);
@@ -910,7 +911,7 @@ test_misc(void)
        return 0;
 }
 
-int
+static int
 test_acl(void)
 {
        if (test_invalid_parameters() < 0)
@@ -928,13 +929,9 @@ test_acl(void)
 
        return 0;
 }
-#else
-
-int
-test_acl(void)
-{
-       printf("This binary was not compiled with ACL support!\n");
-       return 0;
-}
 
-#endif /* RTE_LIBRTE_ACL */
+static struct test_command acl_cmd = {
+       .command = "acl_autotest",
+       .callback = test_acl,
+};
+REGISTER_TEST_COMMAND(acl_cmd);