s4:selftest Fix 'make testenv-gdb' and 'make valgrindtest' etc