Skip to content
Snippets Groups Projects

Design for test: Add a way to redirect the helpers path

Merged Simon McVittie requested to merge wip/smcv/redirect-helpers-path into master
1 unresolved thread

We can use this to connect up a mock implementation if necessary.


Intended for use by @jpwhiting in !24 (merged), which has mock wflinfo executables that will need to be found with logic like

if (helpers_path != NULL)
  helper = g_strdup_printf ("%s/%s-wflinfo", helpers_path, multiarch_tuple);
else   /* look in PATH */
  helper = g_strdup_printf ("%s-wflinfo", multiarch_tuple);

if we build them in tests/ and install them in /usr/libexec/installed-tests/steam-runtime-tools-0 as we probably should.

Sorry @denittis, this is going to cause some (hopefully minor) rebase conflicts for you.

Edited by Simon McVittie

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
721 * srt_system_info_set_helpers_path:
722 * @self: The #SrtSystemInfo
723 * @path: (nullable) (type filename) (transfer none): An absolute path
724 *
725 * Look for helper executables used to inspect the system state in @path,
726 * instead of the normal installed location.
727 *
728 * If @path is %NULL, go back to using the installed location.
729 */
730 void
731 srt_system_info_set_helpers_path (SrtSystemInfo *self,
732 const gchar *path)
733 {
734 g_return_if_fail (SRT_IS_SYSTEM_INFO (self));
735
736 forget_libraries (self);
  • Simon McVittie marked as a Work In Progress

    marked as a Work In Progress

  • Simon McVittie changed the description

    changed the description

  • Simon McVittie added 1 commit

    added 1 commit

    • 04bde362 - Design for test: Add a way to redirect the helpers path

    Compare with previous version

  • Simon McVittie unmarked as a Work In Progress

    unmarked as a Work In Progress

  • Simon McVittie mentioned in merge request !30 (merged)

    mentioned in merge request !30 (merged)

  • Simon McVittie mentioned in merge request !24 (merged)

    mentioned in merge request !24 (merged)

  • Jeremy Whiting
  • Looks good to me, but probably want to hold off until @denittis has needed changes on his branch.

  • I've just merged @denittis' branch. I don't think anything will need to be changed in that branch, because it doesn't actually use helper subprocesses - I just need to fix the merge conflicts.

  • K, perfect.

  • Looks good to me too.

  • Simon McVittie added 4 commits

    added 4 commits

    Compare with previous version

  • @jpwhiting: if you are happy with this, please merge it and rebase your GL branch onto it.

  • Jeremy Whiting mentioned in commit 7bda7568

    mentioned in commit 7bda7568

  • Please register or sign in to reply
    Loading