3 files changed, 20 insertions, 1 deletions

diff --git a/src/unit/myriad.unit b/src/unit/myriad.unit
index bc05bf7..cf861a3 100644
--- a/src/unit/myriad.unit
+++ b/src/unit/myriad.unit
@@ -76,7 +76,7 @@ suite Myriad
         {
                 FString sFileName("myriad-XXXXXXX");
 
-                File::tempFile( sFileName );
+                tempFile( sFileName );
                 File fMyriad( sFileName, File::WriteNew|File::Read );
                 Myriad m( fMyriad );
                 m.initialize( 64 );
diff --git a/src/unitsuite.cpp b/src/unitsuite.cpp
index a66160e..51cca10 100644
--- a/src/unitsuite.cpp
+++ b/src/unitsuite.cpp
@@ -6,6 +6,9 @@
  */
 
 #include "bu/unitsuite.h"
+#include "bu/file.h"
+
+#include <unistd.h>
 
 Bu::UnitSuite::UnitSuite() :
         iOptions( 0 )
@@ -102,9 +105,20 @@ int Bu::UnitSuite::run( int /*argc*/, char * /*argv */ [] )
         if( iUPass == 0 && iUFail == 0 )
                 printf("\tNothing unexpected.\n\n");
 
+        for( StrList::iterator i = lFileCleanup.begin(); i; i++ )
+        {
+                unlink( (*i).getStr() );
+        }
+
         return 0;
 }
 
+void Bu::UnitSuite::tempFile( Bu::FString &sFileName )
+{
+        Bu::File::tempFile( sFileName );
+        lFileCleanup.append( sFileName );
+}
+
 void Bu::UnitSuite::add( Test fTest, const Bu::FString &sName, Expect e )
 {
         TestInfo ti;
diff --git a/src/unitsuite.h b/src/unitsuite.h
index ad6bedb..7d026c2 100644
--- a/src/unitsuite.h
+++ b/src/unitsuite.h
@@ -61,6 +61,8 @@ namespace Bu
 
                 int run( int argc=0, char *argv[]=NULL );
 
+                void tempFile( Bu::FString &sFileName );
+
                 typedef void (UnitSuite::*Test)();
 
                 class Failed
@@ -105,6 +107,9 @@ namespace Bu
                 FString sSuiteName;
 
                 int iOptions;
+
+                typedef Bu::List<Bu::FString> StrList;
+                StrList lFileCleanup;
         };
 }