X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_eal_flags.c;h=91b40664baae326969bdf72a990b84f8512c8c60;hb=dd0eedb1cfcf0cb7423d859177c5bc6f931eaf8a;hp=0a8269ca50ba21210a6baf5224ce0aaa640a7a69;hpb=2ed44e38fa1be16e093fc06e3800bbaf9c2b7388;p=dpdk.git diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c index 0a8269ca50..91b40664ba 100644 --- a/app/test/test_eal_flags.c +++ b/app/test/test_eal_flags.c @@ -414,13 +414,13 @@ test_invalid_vdev_flag(void) /* Test with valid vdev option */ const char *vdevval1[] = {prgname, prefix, "-n", "1", - "-c", "1", vdev, "eth_ring0"}; + "-c", "1", vdev, "net_ring0"}; const char *vdevval2[] = {prgname, prefix, "-n", "1", - "-c", "1", vdev, "eth_ring0,args=test"}; + "-c", "1", vdev, "net_ring0,args=test"}; const char *vdevval3[] = {prgname, prefix, "-n", "1", - "-c", "1", vdev, "eth_ring0,nodeaction=r1:0:CREATE"}; + "-c", "1", vdev, "net_ring0,nodeaction=r1:0:CREATE"}; if (launch_proc(vdevinval) == 0) { printf("Error - process did run ok with invalid " @@ -512,47 +512,119 @@ test_missing_c_flag(void) /* -c flag but no coremask value */ const char *argv1[] = { prgname, prefix, mp_flag, "-n", "3", "-c"}; - /* No -c or -l flag at all */ + /* No -c, -l or --lcores flag at all */ const char *argv2[] = { prgname, prefix, mp_flag, "-n", "3"}; /* bad coremask value */ - const char *argv3[] = { prgname, prefix, mp_flag, "-n", "3", "-c", "error" }; + const char *argv3[] = { prgname, prefix, mp_flag, + "-n", "3", "-c", "error" }; /* sanity check of tests - valid coremask value */ - const char *argv4[] = { prgname, prefix, mp_flag, "-n", "3", "-c", "1" }; + const char *argv4[] = { prgname, prefix, mp_flag, + "-n", "3", "-c", "1" }; /* -l flag but no corelist value */ - const char *argv5[] = { prgname, prefix, mp_flag, "-n", "3", "-l"}; - const char *argv6[] = { prgname, prefix, mp_flag, "-n", "3", "-l", " " }; + const char *argv5[] = { prgname, prefix, mp_flag, + "-n", "3", "-l"}; + const char *argv6[] = { prgname, prefix, mp_flag, + "-n", "3", "-l", " " }; /* bad corelist values */ - const char *argv7[] = { prgname, prefix, mp_flag, "-n", "3", "-l", "error" }; - const char *argv8[] = { prgname, prefix, mp_flag, "-n", "3", "-l", "1-" }; - const char *argv9[] = { prgname, prefix, mp_flag, "-n", "3", "-l", "1," }; - const char *argv10[] = { prgname, prefix, mp_flag, "-n", "3", "-l", "1#2" }; + const char *argv7[] = { prgname, prefix, mp_flag, + "-n", "3", "-l", "error" }; + const char *argv8[] = { prgname, prefix, mp_flag, + "-n", "3", "-l", "1-" }; + const char *argv9[] = { prgname, prefix, mp_flag, + "-n", "3", "-l", "1," }; + const char *argv10[] = { prgname, prefix, mp_flag, + "-n", "3", "-l", "1#2" }; /* sanity check test - valid corelist value */ - const char *argv11[] = { prgname, prefix, mp_flag, "-n", "3", "-l", "1-2,3" }; + const char *argv11[] = { prgname, prefix, mp_flag, + "-n", "3", "-l", "1-2,3" }; + + /* --lcores flag but no lcores value */ + const char *argv12[] = { prgname, prefix, mp_flag, + "-n", "3", "--lcores" }; + const char *argv13[] = { prgname, prefix, mp_flag, + "-n", "3", "--lcores", " " }; + /* bad lcores value */ + const char *argv14[] = { prgname, prefix, mp_flag, + "-n", "3", "--lcores", "1-3-5" }; + const char *argv15[] = { prgname, prefix, mp_flag, + "-n", "3", "--lcores", "0-1,,2" }; + const char *argv16[] = { prgname, prefix, mp_flag, + "-n", "3", "--lcores", "0-,1" }; + const char *argv17[] = { prgname, prefix, mp_flag, + "-n", "3", "--lcores", "(0-,2-4)" }; + const char *argv18[] = { prgname, prefix, mp_flag, + "-n", "3", "--lcores", "(-1,2)" }; + const char *argv19[] = { prgname, prefix, mp_flag, + "-n", "3", "--lcores", "(2-4)@(2-4-6)" }; + const char *argv20[] = { prgname, prefix, mp_flag, + "-n", "3", "--lcores", "(a,2)" }; + const char *argv21[] = { prgname, prefix, mp_flag, + "-n", "3", "--lcores", "1-3@(1,3)" }; + const char *argv22[] = { prgname, prefix, mp_flag, + "-n", "3", "--lcores", "3@((1,3)" }; + const char *argv23[] = { prgname, prefix, mp_flag, + "-n", "3", "--lcores", "(4-7)=(1,3)" }; + const char *argv24[] = { prgname, prefix, mp_flag, + "-n", "3", "--lcores", "[4-7]@(1,3)" }; + /* sanity check of tests - valid lcores value */ + const char *argv25[] = { prgname, prefix, mp_flag, + "-n", "3", "--lcores", + "0-1,2@(5-7),(3-5)@(0,2),(0,6),7"}; + + if (launch_proc(argv2) != 0) { + printf("Error - " + "process did not run ok when missing -c flag\n"); + return -1; + } if (launch_proc(argv1) == 0 - || launch_proc(argv2) == 0 || launch_proc(argv3) == 0) { - printf("Error - process ran without error when missing -c flag\n"); + printf("Error - " + "process ran without error with invalid -c flag\n"); return -1; } if (launch_proc(argv4) != 0) { - printf("Error - process did not run ok with valid coremask value\n"); + printf("Error - " + "process did not run ok with valid coremask value\n"); return -1; } + /* start -l test */ if (launch_proc(argv5) == 0 || launch_proc(argv6) == 0 || launch_proc(argv7) == 0 || launch_proc(argv8) == 0 || launch_proc(argv9) == 0 || launch_proc(argv10) == 0) { - printf("Error - process ran without error with invalid -l flag\n"); + printf("Error - " + "process ran without error with invalid -l flag\n"); return -1; } if (launch_proc(argv11) != 0) { - printf("Error - process did not run ok with valid corelist value\n"); + printf("Error - " + "process did not run ok with valid corelist value\n"); return -1; } + + /* start --lcores tests */ + if (launch_proc(argv12) == 0 || launch_proc(argv13) == 0 || + launch_proc(argv14) == 0 || launch_proc(argv15) == 0 || + launch_proc(argv16) == 0 || launch_proc(argv17) == 0 || + launch_proc(argv18) == 0 || launch_proc(argv19) == 0 || + launch_proc(argv20) == 0 || launch_proc(argv21) == 0 || + launch_proc(argv21) == 0 || launch_proc(argv22) == 0 || + launch_proc(argv23) == 0 || launch_proc(argv24) == 0) { + printf("Error - " + "process ran without error with invalid --lcore flag\n"); + return -1; + } + + if (launch_proc(argv25) != 0) { + printf("Error - " + "process did not run ok with valid corelist value\n"); + return -1; + } + return 0; } @@ -602,13 +674,13 @@ test_master_lcore_flag(void) } /* - * Test that the app doesn't run without the -n flag. In all cases - * should give an error and fail to run. + * Test that the app doesn't run with invalid -n flag option. + * Final test ensures it does run with valid options as sanity check * Since -n is not compulsory for MP, we instead use --no-huge and --no-shconf * flags. */ static int -test_missing_n_flag(void) +test_invalid_n_flag(void) { #ifdef RTE_EXEC_ENV_BSDAPP /* BSD target doesn't support prefixes at this point */ @@ -624,26 +696,31 @@ test_missing_n_flag(void) /* -n flag but no value */ const char *argv1[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n"}; - /* No -n flag at all */ - const char *argv2[] = { prgname, prefix, no_huge, no_shconf, "-c", "1"}; /* bad numeric value */ - const char *argv3[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n", "e" }; - /* out-of-range value */ - const char *argv4[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n", "9" }; + const char *argv2[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n", "e" }; + /* zero is invalid */ + const char *argv3[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n", "0" }; /* sanity test - check with good value */ - const char *argv5[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n", "2" }; + const char *argv4[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n", "2" }; + /* sanity test - check with no -n flag */ + const char *argv5[] = { prgname, prefix, no_huge, no_shconf, "-c", "1"}; if (launch_proc(argv1) == 0 || launch_proc(argv2) == 0 - || launch_proc(argv3) == 0 - || launch_proc(argv4) == 0) { - printf("Error - process ran without error when missing -n flag\n"); + || launch_proc(argv3) == 0) { + printf("Error - process ran without error when" + "invalid -n flag\n"); return -1; } - if (launch_proc(argv5) != 0) { + if (launch_proc(argv4) != 0) { printf("Error - process did not run ok with valid num-channel value\n"); return -1; } + if (launch_proc(argv5) != 0) { + printf("Error - process did not run ok without -n flag\n"); + return -1; + } + return 0; } @@ -681,8 +758,8 @@ test_no_hpet_flag(void) } /* - * Test that the app runs with --no-huge and doesn't run when either - * -m or --socket-mem are specified with --no-huge. + * Test that the app runs with --no-huge and doesn't run when --socket-mem are + * specified with --no-huge. */ static int test_no_huge_flag(void) @@ -711,8 +788,8 @@ test_no_huge_flag(void) printf("Error - process did not run ok with --no-huge flag\n"); return -1; } - if (launch_proc(argv2) == 0) { - printf("Error - process run ok with --no-huge and -m flags\n"); + if (launch_proc(argv2) != 0) { + printf("Error - process did not run ok with --no-huge and -m flags\n"); return -1; } #ifdef RTE_EXEC_ENV_BSDAPP @@ -1296,9 +1373,9 @@ test_eal_flags(void) return ret; } - ret = test_missing_n_flag(); + ret = test_invalid_n_flag(); if (ret < 0) { - printf("Error in test_missing_n_flag()\n"); + printf("Error in test_invalid_n_flag()\n"); return ret; } @@ -1364,8 +1441,4 @@ test_eal_flags(void) return ret; } -static struct test_command eal_flags_cmd = { - .command = "eal_flags_autotest", - .callback = test_eal_flags, -}; -REGISTER_TEST_COMMAND(eal_flags_cmd); +REGISTER_TEST_COMMAND(eal_flags_autotest, test_eal_flags);