portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

archos/: Support any arch for not- categories (#1713)

Browse source
This commit is contained in:
Khairul Azhar Kasmiran 2021-09-18 20:21:19 +08:00 committed by Anton Kochkov
parent 3d606a4b92
commit 9b2b4f97ea
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
binrz/rz-test/load.c
View file

@ -588,6 +588,23 @@ static RzTestType test_type_for_path(const char *path, bool *load_plugins) {
return ret;
}
static inline bool skip_archos(const char *subname) {
rz_return_val_if_fail(subname, true);
if (!strcmp(subname, RZ_TEST_ARCH_OS)) {
return false;
}
if (rz_str_startswith(subname, "not-")) {
const char *neg_subname = subname + strlen("not-");
const char *second_dash = strchr(neg_subname, '-');
rz_return_val_if_fail(second_dash, true);
if (strncmp(RZ_TEST_ARCH_OS, neg_subname, second_dash - neg_subname) &&
(rz_str_endswith(RZ_TEST_ARCH_OS, strrchr(subname, '-')) || rz_str_endswith(subname, "-any"))) {
return false;
}
}
return true;
}
static bool database_load(RzTestDatabase *db, const char *path, int depth) {
if (depth <= 0) {
eprintf("Directories for loading tests too deep: %s\n", path);
@ -612,10 +629,7 @@ static bool database_load(RzTestDatabase *db, const char *path, int depth) {
eprintf("Skipping %s" RZ_SYS_DIR "%s because it requires additional dependencies.\n", path, subname);
continue;
}
if ((!strcmp(path, "archos") || rz_str_endswith(path, RZ_SYS_DIR "archos")) && strcmp(subname, RZ_TEST_ARCH_OS) &&
!(rz_str_startswith(subname, "not-") &&
strcmp(RZ_TEST_ARCH_OS, subname + strlen("not-")) &&
rz_str_endswith(RZ_TEST_ARCH_OS, strrchr(subname, '-')))) {
if ((!strcmp(path, "archos") || rz_str_endswith(path, RZ_SYS_DIR "archos")) && skip_archos(subname)) {
eprintf("Skipping %s" RZ_SYS_DIR "%s because it does not match the current platform.\n", path, subname);
continue;
}

0
test/db/archos/not-windows-x64/cmd_pt → test/db/archos/not-windows-any/cmd_pt
View file