Merge branch 'tr/valgrind-test-fix'

* tr/valgrind-test-fix:
Revert "test-lib: allow prefixing a custom string before "ok N" etc."
Revert "test-lib: support running tests under valgrind in parallel"

diff --cc t/test-lib.sh
Simple merge