#define no_hpet "--no-hpet"
#define no_huge "--no-huge"
#define no_shconf "--no-shconf"
-#define pci_whitelist "--pci-whitelist"
+#define allow "--allow"
#define vdev "--vdev"
#define memtest "memtest"
#define memtest1 "memtest1"
case HUGEPAGE_CHECK_EXISTS:
{
/* file exists, return */
+ closedir(hugepage_dir);
result = 1;
goto end;
}
#endif
/*
- * Test that the app doesn't run with invalid whitelist option.
+ * Test that the app doesn't run with invalid allow option.
* Final tests ensures it does run with valid options as sanity check (one
* test for with Domain+BDF, second for just with BDF)
*/
static int
-test_whitelist_flag(void)
+test_allow_flag(void)
{
unsigned i;
#ifdef RTE_EXEC_ENV_FREEBSD
const char *wlinval[][7] = {
{prgname, prefix, mp_flag,
- pci_whitelist, "error", "", ""},
+ allow, "error", "", ""},
{prgname, prefix, mp_flag,
- pci_whitelist, "0:0:0", "", ""},
+ allow, "0:0:0", "", ""},
{prgname, prefix, mp_flag,
- pci_whitelist, "0:error:0.1", "", ""},
+ allow, "0:error:0.1", "", ""},
{prgname, prefix, mp_flag,
- pci_whitelist, "0:0:0.1error", "", ""},
+ allow, "0:0:0.1error", "", ""},
{prgname, prefix, mp_flag,
- pci_whitelist, "error0:0:0.1", "", ""},
+ allow, "error0:0:0.1", "", ""},
{prgname, prefix, mp_flag,
- pci_whitelist, "0:0:0.1.2", "", ""},
+ allow, "0:0:0.1.2", "", ""},
};
- /* Test with valid whitelist option */
+ /* Test with valid allow option */
const char *wlval1[] = {prgname, prefix, mp_flag,
- pci_whitelist, "00FF:09:0B.3"};
+ allow, "00FF:09:0B.3"};
const char *wlval2[] = {prgname, prefix, mp_flag,
- pci_whitelist, "09:0B.3", pci_whitelist, "0a:0b.1"};
+ allow, "09:0B.3", allow, "0a:0b.1"};
const char *wlval3[] = {prgname, prefix, mp_flag,
- pci_whitelist, "09:0B.3,type=test",
- pci_whitelist, "08:00.1,type=normal",
+ allow, "09:0B.3,type=test",
+ allow, "08:00.1,type=normal",
};
for (i = 0; i < RTE_DIM(wlinval); i++) {
if (launch_proc(wlinval[i]) == 0) {
printf("Error - process did run ok with invalid "
- "whitelist parameter\n");
+ "allow parameter\n");
return -1;
}
}
if (launch_proc(wlval1) != 0 ) {
- printf("Error - process did not run ok with valid whitelist\n");
+ printf("Error - process did not run ok with valid allow\n");
return -1;
}
if (launch_proc(wlval2) != 0 ) {
- printf("Error - process did not run ok with valid whitelist value set\n");
+ printf("Error - process did not run ok with valid allow value set\n");
return -1;
}
if (launch_proc(wlval3) != 0 ) {
- printf("Error - process did not run ok with valid whitelist + args\n");
+ printf("Error - process did not run ok with valid allow + args\n");
return -1;
}
}
/*
- * Test that the app doesn't run with invalid blacklist option.
+ * Test that the app doesn't run with invalid blocklist option.
* Final test ensures it does run with valid options as sanity check
*/
static int
{prgname, prefix, mp_flag, "-b", "error0:0:0.1"},
{prgname, prefix, mp_flag, "-b", "0:0:0.1.2"},
};
- /* Test with valid blacklist option */
+ /* Test with valid blocklist option */
const char *blval[] = {prgname, prefix, mp_flag,
"-b", "FF:09:0B.3"};
for (i = 0; i != RTE_DIM(blinval); i++) {
if (launch_proc(blinval[i]) == 0) {
printf("Error - process did run ok with invalid "
- "blacklist parameter\n");
+ "blocklist parameter\n");
return -1;
}
}
if (launch_proc(blval) != 0) {
- printf("Error - process did not run ok with valid blacklist value\n");
+ printf("Error - process did not run ok with valid blocklist value\n");
return -1;
}
return 0;
{prgname, prefix, mp_flag, "-r", "-1"},
{prgname, prefix, mp_flag, "-r", "17"},
};
- /* Test with valid blacklist option */
+ /* Test with valid blocklist option */
const char *rval[] = {prgname, prefix, mp_flag, "-r", "16"};
int i;
}
/*
- * Test --master-lcore option with matching coremask
+ * Test --main-lcore option with matching coremask
*/
static int
-test_master_lcore_flag(void)
+test_main_lcore_flag(void)
{
#ifdef RTE_EXEC_ENV_FREEBSD
/* BSD target doesn't support prefixes at this point */
if (!rte_lcore_is_enabled(0) || !rte_lcore_is_enabled(1))
return TEST_SKIPPED;
- /* --master-lcore flag but no value */
+ /* --main-lcore flag but no value */
const char *argv1[] = { prgname, prefix, mp_flag,
- "-c", "3", "--master-lcore"};
- /* --master-lcore flag with invalid value */
+ "-c", "3", "--main-lcore"};
+ /* --main-lcore flag with invalid value */
const char *argv2[] = { prgname, prefix, mp_flag,
- "-c", "3", "--master-lcore", "-1"};
+ "-c", "3", "--main-lcore", "-1"};
const char *argv3[] = { prgname, prefix, mp_flag,
- "-c", "3", "--master-lcore", "X"};
- /* master lcore not in coremask */
+ "-c", "3", "--main-lcore", "X"};
+ /* main lcore not in coremask */
const char *argv4[] = { prgname, prefix, mp_flag,
- "-c", "3", "--master-lcore", "2"};
+ "-c", "3", "--main-lcore", "2"};
/* valid value */
const char *argv5[] = { prgname, prefix, mp_flag,
- "-c", "3", "--master-lcore", "1"};
+ "-c", "3", "--main-lcore", "1"};
/* valid value set before coremask */
const char *argv6[] = { prgname, prefix, mp_flag,
- "--master-lcore", "1", "-c", "3"};
+ "--main-lcore", "1", "-c", "3"};
if (launch_proc(argv1) == 0
|| launch_proc(argv2) == 0
|| launch_proc(argv3) == 0
|| launch_proc(argv4) == 0) {
- printf("Error - process ran without error with wrong --master-lcore\n");
+ printf("Error - process ran without error with wrong --main-lcore\n");
return -1;
}
if (launch_proc(argv5) != 0
|| launch_proc(argv6) != 0) {
- printf("Error - process did not run ok with valid --master-lcore\n");
+ printf("Error - process did not run ok with valid --main-lcore\n");
return -1;
}
return 0;
return ret;
}
- ret = test_master_lcore_flag();
+ ret = test_main_lcore_flag();
if (ret < 0) {
- printf("Error in test_master_lcore_flag()\n");
+ printf("Error in test_main_lcore_flag()\n");
return ret;
}
return ret;
}
- ret = test_whitelist_flag();
+ ret = test_allow_flag();
if (ret < 0) {
- printf("Error in test_invalid_whitelist_flag()\n");
+ printf("Error in test_allow_flag()\n");
return ret;
}
/* subtests used in meson for CI */
REGISTER_TEST_COMMAND(eal_flags_c_opt_autotest, test_missing_c_flag);
-REGISTER_TEST_COMMAND(eal_flags_master_opt_autotest, test_master_lcore_flag);
+REGISTER_TEST_COMMAND(eal_flags_main_opt_autotest, test_main_lcore_flag);
REGISTER_TEST_COMMAND(eal_flags_n_opt_autotest, test_invalid_n_flag);
REGISTER_TEST_COMMAND(eal_flags_hpet_autotest, test_no_hpet_flag);
REGISTER_TEST_COMMAND(eal_flags_no_huge_autotest, test_no_huge_flag);
-REGISTER_TEST_COMMAND(eal_flags_w_opt_autotest, test_whitelist_flag);
+REGISTER_TEST_COMMAND(eal_flags_a_opt_autotest, test_allow_flag);
REGISTER_TEST_COMMAND(eal_flags_b_opt_autotest, test_invalid_b_flag);
REGISTER_TEST_COMMAND(eal_flags_vdev_opt_autotest, test_invalid_vdev_flag);
REGISTER_TEST_COMMAND(eal_flags_r_opt_autotest, test_invalid_r_flag);
git.droids-corp.org / dpdk.git / blobdiff