On Sun, Jul 14, 2024 at 12:17:09PM +0200, René Scharfe wrote: > > Should we be using check_str_loc() in the post-image? > > Yes, and check_uint_loc() and check_pointer_eq_loc() as well. Which > would be a pain. Or we drag everything into the macro check_strvec and > get the caller's line number for free. Is it that big of a pain? It's mostly just passing "loc" along to the relative functions. To me it is more a problem that it is super easy to forget. Are the unit tests themselves multi-threaded within a single program? I'd think not. In which case, I kind of wonder if a simpler pattern would be to just set a global "location" variable (probably as a stack of strings) that all of the individual check functions used. And then we could set it once at the top-level of the test which wants its location reported, and any helper functions that get called in the middle would not have to care. And existing check_foo() functions could use the current file/line location if the stack is empty (so code that isn't using helper functions can remain unaffected). -Peff