From a31a9b7ef81f47d6972a2a74fe9c660c4d250d55 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 14 Mar 2024 16:04:09 -0400 Subject: Add fix_tox_conf function * If the user calls tox in a test script like so: tox {{ workaround.tox_posargs }}, then a temporary tox configuration will be generated and the appropriate arguments to use it will be injected into tox's command line arguments --- include/omc.h | 3 +++ include/utils.h | 9 +++++++++ 2 files changed, 12 insertions(+) (limited to 'include') diff --git a/include/omc.h b/include/omc.h index 11252b1..0b1c562 100644 --- a/include/omc.h +++ b/include/omc.h @@ -59,6 +59,9 @@ struct OMC_GLOBAL { char *tmpdir; //!< Path to temporary storage directory char *conda_install_prefix; //!< Path to install conda char *sysconfdir; //!< Path where OMC reads its configuration files (mission directory, etc) + struct { + char *tox_posargs; + } workaround; struct Jfrog { char *jfrog_artifactory_base_url; char *jfrog_artifactory_product; diff --git a/include/utils.h b/include/utils.h index b03d99e..4d3cd3d 100644 --- a/include/utils.h +++ b/include/utils.h @@ -254,4 +254,13 @@ int isempty_dir(const char *path); * @return 0 on success, -1 on error */ int xml_pretty_print_in_place(const char *filename, const char *pretty_print_prog, const char *pretty_print_args); + +/** + * Applies OMC fixups to a tox ini config + * @param filename path to tox.ini + * @param result path to processed configuration + * @return 0 on success, -1 on error + */ +int fix_tox_conf(const char *filename, char **result); + #endif //OMC_UTILS_H -- cgit