JakeHillion/object-introspection
1
0
Fork 0
mirror of https://github.com/JakeHillion/object-introspection.git synced 2024-09-19 11:09:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

add feature addition to the integration test runner

Browse Source
This commit is contained in:
Jake Hillion 2023-04-21 03:40:02 -07:00 committed by Jake Hillion
parent 641a128b39
commit 789fb7ef6e
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/integration/runner_common.cpp
View File

@ -29,6 +29,7 @@ bool verbose = false;
bool preserve = false; bool preserve = false;
bool preserve_on_failure = false; bool preserve_on_failure = false;
bool run_skipped_tests = false; bool run_skipped_tests = false;
std::vector<std::string> extra_feature_args{};
constexpr static OIOpts opts{ constexpr static OIOpts opts{
OIOpt{'h', "help", no_argument, nullptr, "Print this message and exit"}, OIOpt{'h', "help", no_argument, nullptr, "Print this message and exit"},
@ -42,6 +43,8 @@ constexpr static OIOpts opts{
"Force running tests, even if they are marked as skipped"}, "Force running tests, even if they are marked as skipped"},
OIOpt{'x', "oid", required_argument, nullptr, OIOpt{'x', "oid", required_argument, nullptr,
"Path to OID executable to test"}, "Path to OID executable to test"},
OIOpt{'\0', "enable-feature", required_argument, nullptr,
"Enable extra OID feature."},
}; };
void usage(std::string_view progname) { void usage(std::string_view progname) {
@ -73,6 +76,9 @@ int main(int argc, char* argv[]) {
// directory is changed // directory is changed
oidExe = fs::absolute(optarg); oidExe = fs::absolute(optarg);
break; break;
case '\0':
extra_feature_args.push_back(std::string("-f") + optarg);
break;
case 'h': case 'h':
default: default:
usage(argv[0]); usage(argv[0]);
@ -218,8 +224,13 @@ OidProc OidIntegration::runOidOnProcess(OidOpts opts,
"--script-source"s, opts.scriptSource, "--script-source"s, opts.scriptSource,
"--pid"s, std::to_string(targetProcess.id()), "--pid"s, std::to_string(targetProcess.id()),
}; };
// clang-format on // clang-format on
auto oid_args = extra_args;
// Specify feature args first so they can be overridden by extra_args of
// specific tests.
auto oid_args = extra_feature_args;
oid_args.insert(oid_args.end(), extra_args.begin(), extra_args.end());
oid_args.insert(oid_args.end(), default_args.begin(), default_args.end()); oid_args.insert(oid_args.end(), default_args.begin(), default_args.end());
if (verbose) { if (verbose) {