am 1ceb9824: Merge "Fix a getcwd(3) bug and make our tests run correctly under valgrind."

* commit '1ceb9824ab39501e98300bc87f7984ee6b455ce8':
  Fix a getcwd(3) bug and make our tests run correctly under valgrind.