getting through tests on mac

[feisty_meow.git] / nucleus / library / tests_filesystem / test_directory_tree.cpp

diff --git a/nucleus/library/tests_filesystem/test_directory_tree.cpp b/nucleus/library/tests_filesystem/test_directory_tree.cpp
index f9fa5adf8bc3670b45dadb1ec4bf987388a9ca3d..7897831bf0b3b916db6188a009368d13826a3ff9 100644 (file)
--- a/nucleus/library/tests_filesystem/test_directory_tree.cpp
+++ b/nucleus/library/tests_filesystem/test_directory_tree.cpp
@@ -54,7 +54,7 @@ int test_directory_tree::execute()
 {
   FUNCDEF("execute");
 
-  astring path = "/usr/include";
+  astring path = "/usr/lib";
 #ifdef __WIN32__
   // default path for windoze uses an area that should always exist.
   path = environment::get("COMMONPROGRAMFILES");
@@ -197,7 +197,7 @@ LOG(diffs.text_form());
 LOG("reading tree to recreate");
     directory_tree dir(path, pattern.s());
     ASSERT_TRUE(dir.good(), "makedirs test directory reading");
-    filename tmpdir(environment::get("GENERATED_DIR") + "/zz_balfazzaral");
+    filename tmpdir(environment::get("FEISTY_MEOW_GENERATED_STORE") + "/zz_balfazzaral");
     LOG(astring("will write to tmp in ") + tmpdir);
     basis::outcome result = dir.make_directories(tmpdir.raw());
     ASSERT_EQUAL(result.value(), common::OKAY, "makedirs should succeed");
@@ -216,7 +216,7 @@ LOG("what happened with that?  did it work?");
 
 //hmmm: plug in real recursive delete here instead.
 basis::un_int kid;
-launch_process::run("rm", astring("-rf ") + tmpdir.raw(), launch_process::AWAIT_APP_EXIT, kid);
+launch_process::run("/bin/rm", astring("-rf ") + tmpdir.raw(), launch_process::AWAIT_APP_EXIT, kid);
 ASSERT_FALSE(kid, "removing temporary files after test");
 
   }