X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Ftests_filesystem%2Ftest_directory_tree.cpp;h=77b32a3737b362446b325a407c4332e1cc595567;hb=d60e7a2467ab8be80a06ba670ccba1819ca7c0e4;hp=f0a84671604fd6153bbe54fadded32ebd148e910;hpb=c93ddbe5db0e3295f90f12685f96d86a060f4cd0;p=feisty_meow.git diff --git a/nucleus/library/tests_filesystem/test_directory_tree.cpp b/nucleus/library/tests_filesystem/test_directory_tree.cpp index f0a84671..77b32a37 100644 --- a/nucleus/library/tests_filesystem/test_directory_tree.cpp +++ b/nucleus/library/tests_filesystem/test_directory_tree.cpp @@ -12,16 +12,17 @@ * Please send any updates to: fred@gruntose.com * */ +#include #include #include -#include -#include -#include -#include #include #include #include +#include +#include +#include #include +#include #include #include @@ -30,6 +31,7 @@ using namespace basis; using namespace mathematics; using namespace filesystem; using namespace loggers; +using namespace processes; using namespace structures; using namespace textual; using namespace timely; @@ -195,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("TMP") + "/zz_balfazzaral"); + filename tmpdir(environment::get("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"); @@ -206,6 +208,17 @@ LOG("what happened with that? did it work?"); //hmmm: compare the directories with what we expect to be made; // do a dirtree iterator on the path, and make sure each of those exists in the target place. + + // clean up the output directory. +//this won't do it; it's a directory! +// bool worked = tmpdir.recursive_unlink(); +// ASSERT_TRUE(worked, "removing temporary files after test"); + +//hmmm: plug in real recursive delete here instead. +basis::un_int kid; +launch_process::run("/bin/rm", astring("-rf ") + tmpdir.raw(), launch_process::AWAIT_APP_EXIT, kid); +ASSERT_FALSE(kid, "removing temporary files after test"); + }