Changeset 486

Timestamp:

08/07/09 14:32:01 (15 years ago)

Author:

vbarta

Message:

fixed test utils for windows (debug testsuite passes)

Location:

library/tests

Files:

• test_util.cpp (modified) (2 diffs)
• test_util.h (modified) (1 diff)

library/tests/test_util.cpp

@@ -30 +30 @@
         char buffer[8192];
         memset ( buffer, 0, sizeof ( buffer ) );
-        std::ifstream src ( fname, std::ios_base::binary );
+        std::ifstream src ( fname );
         src.read ( buffer, sizeof ( buffer ) - 1 );
         return std::string ( buffer );
@@ -65 +65 @@
                 }
         } else {
-                if ( errno == ENOTDIR ) {
+                if ( ( errno == ENOTDIR ) || // Linux 
+                     ( errno == EINVAL ) ) { // Windows
                         if ( unlink ( path ) ) {
                                 std::string msg = "can't remove file ";

library/tests/test_util.h

@@ -23 +23 @@
 /*! \brief Non-general but simple file load.
 
-  Handles only files smaller than 8KB which do not contain '\0'
+  Handles only text files smaller than 8KB which do not contain '\0'
   characters, but for testing that should be enough.
 */