aboutsummaryrefslogtreecommitdiff
path: root/contrib/kyua/model
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/kyua/model')
-rw-r--r--contrib/kyua/model/metadata.cpp16
-rw-r--r--contrib/kyua/model/metadata.hpp4
-rw-r--r--contrib/kyua/model/metadata_test.cpp6
-rw-r--r--contrib/kyua/model/test_case_test.cpp2
-rw-r--r--contrib/kyua/model/test_program_test.cpp8
5 files changed, 15 insertions, 21 deletions
diff --git a/contrib/kyua/model/metadata.cpp b/contrib/kyua/model/metadata.cpp
index a5a9a1315964..afb31435a238 100644
--- a/contrib/kyua/model/metadata.cpp
+++ b/contrib/kyua/model/metadata.cpp
@@ -256,9 +256,7 @@ init_tree(config::tree& tree)
tree.define< bytes_node >("required_disk_space");
tree.define< paths_set_node >("required_files");
tree.define< bytes_node >("required_memory");
-#ifdef __FreeBSD__
tree.define< config::strings_set_node >("required_kmods");
-#endif
tree.define< paths_set_node >("required_programs");
tree.define< user_node >("required_user");
tree.define< delta_node >("timeout");
@@ -285,9 +283,7 @@ set_defaults(config::tree& tree)
tree.set< bytes_node >("required_disk_space", units::bytes(0));
tree.set< paths_set_node >("required_files", model::paths_set());
tree.set< bytes_node >("required_memory", units::bytes(0));
-#ifdef __FreeBSD__
tree.set< config::strings_set_node >("required_kmods", model::strings_set());
-#endif
tree.set< paths_set_node >("required_programs", model::paths_set());
tree.set< user_node >("required_user", "");
// TODO(jmmv): We shouldn't be setting a default timeout like this. See
@@ -603,20 +599,20 @@ model::metadata::required_memory(void) const
}
-#ifdef __FreeBSD__
-/// Returns the list of kmods needed by the test.
+/// Returns the list of kernel modules needed by the test.
///
-/// \return Set of strings.
+/// \return Set of kernel module names.
const model::strings_set&
model::metadata::required_kmods(void) const
{
if (_pimpl->props.is_set("required_kmods")) {
- return _pimpl->props.lookup< config::strings_set_node >("required_kmods");
+ return _pimpl->props.lookup< config::strings_set_node >(
+ "required_kmods");
} else {
- return get_defaults().lookup< config::strings_set_node >("required_kmods");
+ return get_defaults().lookup< config::strings_set_node >(
+ "required_kmods");
}
}
-#endif
/// Returns the list of programs needed by the test.
diff --git a/contrib/kyua/model/metadata.hpp b/contrib/kyua/model/metadata.hpp
index 8af6c7c161af..eee7eaf0f7c4 100644
--- a/contrib/kyua/model/metadata.hpp
+++ b/contrib/kyua/model/metadata.hpp
@@ -76,9 +76,7 @@ public:
const utils::units::bytes& required_disk_space(void) const;
const paths_set& required_files(void) const;
const utils::units::bytes& required_memory(void) const;
-#ifdef __FreeBSD__
const strings_set& required_kmods(void) const;
-#endif
const paths_set& required_programs(void) const;
const std::string& required_user(void) const;
const utils::datetime::delta& timeout(void) const;
@@ -124,9 +122,7 @@ public:
metadata_builder& set_required_disk_space(const utils::units::bytes&);
metadata_builder& set_required_files(const paths_set&);
metadata_builder& set_required_memory(const utils::units::bytes&);
-#ifdef __FreeBSD__
metadata_builder& set_required_kmods(const strings_set&);
-#endif
metadata_builder& set_required_programs(const paths_set&);
metadata_builder& set_required_user(const std::string&);
metadata_builder& set_string(const std::string&, const std::string&);
diff --git a/contrib/kyua/model/metadata_test.cpp b/contrib/kyua/model/metadata_test.cpp
index b4c3dff5b029..bdb1d3655c33 100644
--- a/contrib/kyua/model/metadata_test.cpp
+++ b/contrib/kyua/model/metadata_test.cpp
@@ -57,6 +57,7 @@ ATF_TEST_CASE_BODY(defaults)
ATF_REQUIRE(md.required_configs().empty());
ATF_REQUIRE_EQ(units::bytes(0), md.required_disk_space());
ATF_REQUIRE(md.required_files().empty());
+ ATF_REQUIRE(md.required_kmods().empty());
ATF_REQUIRE_EQ(units::bytes(0), md.required_memory());
ATF_REQUIRE(md.required_programs().empty());
ATF_REQUIRE(md.required_user().empty());
@@ -322,6 +323,7 @@ ATF_TEST_CASE_BODY(to_properties)
props["required_configs"] = "";
props["required_disk_space"] = "0";
props["required_files"] = "bar foo";
+ props["required_kmods"] = "";
props["required_memory"] = "1.00K";
props["required_programs"] = "";
props["required_user"] = "";
@@ -412,7 +414,7 @@ ATF_TEST_CASE_BODY(output__defaults)
"has_cleanup='false', is_exclusive='false', "
"required_configs='', "
"required_disk_space='0', required_files='', "
- "required_memory='0', "
+ "required_kmods='', required_memory='0', "
"required_programs='', required_user='', timeout='300'}",
str.str());
}
@@ -435,7 +437,7 @@ ATF_TEST_CASE_BODY(output__some_values)
"has_cleanup='false', is_exclusive='true', "
"required_configs='', "
"required_disk_space='0', required_files='bar foo', "
- "required_memory='1.00K', "
+ "required_kmods='', required_memory='1.00K', "
"required_programs='', required_user='', timeout='300'}",
str.str());
}
diff --git a/contrib/kyua/model/test_case_test.cpp b/contrib/kyua/model/test_case_test.cpp
index 1e2597d1501e..29df7ee35863 100644
--- a/contrib/kyua/model/test_case_test.cpp
+++ b/contrib/kyua/model/test_case_test.cpp
@@ -204,7 +204,7 @@ ATF_TEST_CASE_BODY(test_case__output)
"has_cleanup='false', "
"is_exclusive='false', "
"required_configs='', required_disk_space='0', required_files='', "
- "required_memory='0', "
+ "required_kmods='', required_memory='0', "
"required_programs='', required_user='', timeout='300'}}",
str.str());
}
diff --git a/contrib/kyua/model/test_program_test.cpp b/contrib/kyua/model/test_program_test.cpp
index ddfbc430387c..f7a84d770fc0 100644
--- a/contrib/kyua/model/test_program_test.cpp
+++ b/contrib/kyua/model/test_program_test.cpp
@@ -547,7 +547,7 @@ check_output__no_test_cases(void)
"description='', execenv='', execenv_jail_params='', "
"has_cleanup='false', is_exclusive='false', "
"required_configs='', required_disk_space='0', required_files='', "
- "required_memory='0', "
+ "required_kmods='', required_memory='0', "
"required_programs='', required_user='', timeout='300'}, "
"test_cases=map()}",
str.str());
@@ -597,7 +597,7 @@ check_output__some_test_cases(void)
"description='', execenv='', execenv_jail_params='', "
"has_cleanup='false', is_exclusive='false', "
"required_configs='', required_disk_space='0', required_files='', "
- "required_memory='0', "
+ "required_kmods='', required_memory='0', "
"required_programs='', required_user='', timeout='300'}, "
"test_cases=map("
"another-name=test_case{name='another-name', "
@@ -605,14 +605,14 @@ check_output__some_test_cases(void)
"description='', execenv='', execenv_jail_params='', "
"has_cleanup='false', is_exclusive='false', "
"required_configs='', required_disk_space='0', required_files='', "
- "required_memory='0', "
+ "required_kmods='', required_memory='0', "
"required_programs='', required_user='', timeout='300'}}, "
"the-name=test_case{name='the-name', "
"metadata=metadata{allowed_architectures='a', allowed_platforms='foo', "
"custom.bar='baz', description='', execenv='', execenv_jail_params='', "
"has_cleanup='false', is_exclusive='false', "
"required_configs='', required_disk_space='0', required_files='', "
- "required_memory='0', "
+ "required_kmods='', required_memory='0', "
"required_programs='', required_user='', timeout='300'}})}",
str.str());
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-24 18:12:19 +0000