Changeset 1458

Timestamp:

Aug 30, 2008, 9:41:00 PM (15 years ago)

Author:

Peter

Message:

moving LFS test to separate file so skipping the test (when using --disable-largefile) becomes more visible.

Location:

trunk/test

Files:

• Makefile.am (modified) (3 diffs)
• fileutil_test.cc (modified) (2 diffs)
• large_file_test.cc (copied) (copied from trunk/test/fileutil_test.cc) (4 diffs)

trunk/test/Makefile.am

@@ -32 +32 @@
 check_LTLIBRARIES = libyattest.la
 
-check_PROGRAMS = alignment_test averager_test                   \
+check_PROGRAMS = alignment_test averager_test \
   commandline_test \
   consensus_inputranker_test data_lookup_1d_test  \
@@ -39 +39 @@
   index_test inputranker_test \
   iterator_test kernel_lookup_test kernel_test \
-  knn_test matrix_lookup_test matrix_test \
+  knn_test large_file_test matrix_lookup_test matrix_test \
   nbc_test \
   ncc_test nni_test normalization_test pca_test \
@@ -79 +79 @@
 kernel_lookup_test_SOURCES = kernel_lookup_test.cc
 knn_test_SOURCES = knn_test.cc  
+large_file_test_SOURCES = large_file_test.cc
 matrix_test_SOURCES = matrix_test.cc
 matrix_lookup_test_SOURCES = matrix_lookup_test.cc

trunk/test/fileutil_test.cc

@@ -23 +23 @@
   02111-1307, USA.
 */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 
 #include "Suite.h"
@@ -182 +178 @@
   }
 
-  #ifndef YAT_LFS_DISABLED
-  test_large_file_support(suite);
-  #else
-  suite.err() << "Skipping test of large file support\n";
-  #endif
   return suite.return_value();
 }
 
-void test_large_file_support(test::Suite& suite)
-{
-  bool ok=true;
-  suite.err() << "Testing Large File Support\n";
-  off_t s = std::numeric_limits<off_t>::max() >> 20;
-  suite.err() << "maximal file size: " << s << " Mb" << std::endl;
-  suite.add(s>2048);
-  if (ok)
-    suite.err() << "Ok\n";
-  else
-    suite.err() << "failed\n";
-}

trunk/test/large_file_test.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2006 Jari Häkkinen
-  Copyright (C) 2007 Jari Häkkinen, Peter Johansson
   Copyright (C) 2008 Peter Johansson
 
@@ -30 +28 @@
 #include "Suite.h"
 
-#include "yat/utility/FileUtil.h"
-#include "yat/utility/Exception.h"
-
-#include <fstream>
-#include <iostream>
 #include <string>
+#include <sys/stat.h>
 
 using namespace theplu::yat;
@@ -43 +37 @@
 {  
   test::Suite suite(argc, argv);
-  suite.err() << "testing FileUtil ... " << std::endl;
-
-  // checking permissions for current directory
-  try {
-    suite.err() << "FileUtil Test 1" << std::endl;
-    bool testval=true;
-    utility::FileUtil file(".");
-    if (testval=file.exists())
-      suite.err() << "\tfile exists: " << file.path() << std::endl;
-    suite.add(testval);
-    if (!(testval=file.permissions("rwx")))
-      suite.err() << "\trwx permissions on " << file.path() << std::endl;
-    suite.add(!testval);
-    if (!(testval=file.permissions("rx")))
-      suite.err() << "\trx permissions on " << file.path() << std::endl;
-    suite.add(!testval);
-    if (!(testval=file.permissions("d")))
-      suite.err() << "\td permissions on " << file.path() << std::endl;
-    suite.add(!testval);
-  }
-  catch (utility::IO_error e) {
-    suite.add(false);
-    suite.err() << e.what() << std::endl;
-  }
-
-  // checking permissions on non-existent file with ./ in path
-  try {
-    suite.err() << "FileUtil Test 2" << std::endl;
-    bool testval=true;
-    // filename below should be unique
-    utility::FileUtil file("./fileio_test.sdf34DSF");
-    suite.err() << "\tpath: " << std::endl;
-    if (!(testval=file.exists()))
-      suite.err() << "\tfile does not exist: " << file.path() << std::endl;
-    suite.add(!testval);
-    if (!(testval=file.permissions("r")))
-      suite.err() << "\tr permission on " << file.path() << std::endl;
-    suite.add(!testval);
-    if (!(testval=file.permissions("rwx")))
-      suite.err() << "\trwx permissions on " << file.path() << std::endl;
-    suite.add(!testval);
-    if (!(testval=file.permissions("w")))
-      suite.err() << "\tw permission on " << file.path() << std::endl;
-    suite.add(!testval); // 'w' on non-existent file ok if directory writeable
-    if (!(testval=file.permissions("d")))
-      suite.err() << "\td permission on " << file.path() << std::endl;
-    suite.add(!testval); 
-  }
-  catch (utility::IO_error e) {
-    suite.add(false);
-    suite.err() << e.what() << std::endl;
-  }
-
-  // checking permissions on non-existent file without ./ in path
-  try {
-    suite.err() << "FileUtil Test 3" << std::endl;
-    bool testval=true;
-    // filename below should be unique
-    utility::FileUtil file("fileio_test.sdf34DSF");
-    if (!(testval=file.exists()))
-      suite.err() << "\tfile does not exist: " << file.path() << std::endl;
-    suite.add(!testval);
-    if (!(testval=file.permissions("r")))
-      suite.err() << "\tr permission on " << file.path() << std::endl;
-    suite.add(!testval);
-    if (!(testval=file.permissions("rwx")))
-      suite.err() << "\trwx permissions on " << file.path() << std::endl;
-    suite.add(!testval);
-    if (!(testval=file.permissions("w")))
-      suite.err() << "\tw permission on " << file.path() << std::endl;
-    suite.add(!testval); // 'w' on non-existent file ok if directory writeable
-    if (!(testval=file.permissions("d")))
-      suite.err() << "\td permission on " << file.path() << std::endl;
-    suite.add(!testval); 
-  }
-  catch (utility::IO_error e) {
-    suite.add(false);
-    suite.err() << e.what() << std::endl;
-  }
-
-  // checking permissions on non-existent file with non-existent
-  // directories in path
-  try {
-    suite.err() << "FileUtil Test 4" << std::endl;
-    bool testval=true;
-     // intermediate dir must be unique!
-    utility::FileUtil file("./fileio_test.sdf34DSF/file");
-    if (!(testval=file.exists()))
-      suite.err() << "\tfile does not exist: " << file.path() << std::endl;
-    suite.add(!testval);
-    if ((testval=file.permissions("r")))
-      suite.err() << "\tr permission failed on " << file.path() << std::endl;
-    suite.add(testval);
-    if (testval=file.permissions("rwx"))
-      suite.err() << "\trwx permissions failed on " << file.path() << std::endl;
-    suite.add(testval);
-    if (testval=file.permissions("w"))
-      suite.err() << "\tw permission failed on " << file.path() << std::endl;
-    suite.add(testval);
-    if (testval=file.permissions("d"))
-      suite.err() << "\td permission failed on " << file.path() << std::endl;
-    suite.add(testval); 
-  }
-  catch (utility::IO_error e) {
-    suite.add(false);
-    suite.err() << e.what() << std::endl;
-  }
-
-  // checking permissions on existent file after non-existence file
-  // has been checked
-  try {
-    suite.err() << "FileUtil Test 5" << std::endl;
-    bool testval=true;
-     // intermediate dir must be unique!
-    utility::FileUtil file("./fileio_test.sdf34DSF/file");
-    if (!(testval=file.exists()))
-      suite.err() << "\tfile does not exist: " << file.path() << std::endl;
-    suite.add(!testval);
-    utility::FileUtil file2(test::filename("fileutil_test.cc").c_str());
-    if (!(testval=!file2.exists()))
-      suite.err() << "\tfile does exist: " << file2.path() << std::endl;
-    suite.add(!testval);
-  }
-  catch (utility::IO_error e) {
-    suite.add(false);
-    suite.err() << e.what() << std::endl;
-  }
-
-  try {
-    suite.err() << "FileUtil Test 6" << std::endl;
-    utility::FileUtil file("fileutil_test.cc");
-    file.permissions("rxwa"); // should throw
-    suite.add(false); 
-  }
-  catch (std::invalid_argument& e) {
-    suite.err() << "Expected exception thrown with what: " << e.what() 
-                << std::endl;
-  }
 
   #ifndef YAT_LFS_DISABLED
@@ -186 +42 @@
   #else
   suite.err() << "Skipping test of large file support\n";
+  exit(77);
   #endif
   return suite.return_value();