Create unittest directories in testdir

See also d575526c91a8e0167a249760d63510e7de67ed23.

diff --git a/unittest/TestUtil.cpp b/unittest/TestUtil.cpp
index 5f53efeb1c66f29d5a78181aa51b4126f77577d4..fa8f7f01b32cb368d371679aaafba6637ea3bebe 100644 (file)
--- a/unittest/TestUtil.cpp
+++ b/unittest/TestUtil.cpp
@@ -28,7 +28,7 @@ size_t TestContext::m_subdir_counter = 0;
 
 TestContext::TestContext() : m_test_dir(Util::get_actual_cwd())
 {
-  if (!Util::base_name(m_test_dir).starts_with("testdir.")) {
+  if (Util::base_name(Util::dir_name(m_test_dir)) != "testdir") {
     throw Error("TestContext instantiated outside test directory");
   }
   ++m_subdir_counter;

diff --git a/unittest/main.cpp b/unittest/main.cpp
index 6e9d02e1d4902f0b8bf5c3e4fcba19b411a8da4b..df9bf599b88e6e20b16a8112f29b467a46399e5c 100644 (file)
--- a/unittest/main.cpp
+++ b/unittest/main.cpp
@@ -35,7 +35,7 @@ main(int argc, char** argv)
   Util::unsetenv("GCC_COLORS"); // Don't confuse argument processing tests.
 
   std::string dir_before = Util::get_actual_cwd();
-  std::string testdir = FMT("testdir.{}", getpid());
+  std::string testdir = FMT("testdir/{}", getpid());
   Util::wipe_path(testdir);
   Util::create_dir(testdir);
   TestUtil::check_chdir(testdir);