Changeset 846 for plugins/base1/se.lu.thep.wenni/trunk/test/wenni_test.cc

Timestamp:

Dec 1, 2008, 7:41:08 PM (15 years ago)

Author:

Peter Johansson

Message:

fixed so test can be run outside 'make check'

File:

• plugins/base1/se.lu.thep.wenni/trunk/test/wenni_test.cc (modified) (7 diffs)

plugins/base1/se.lu.thep.wenni/trunk/test/wenni_test.cc

@@ -40 +40 @@
 bool compare(const std::string&, const std::string&, double error_bound=1e-20);
 bool diff(const std::string&, const std::string&);
+std::string get_srcdir(void);
 bool rm(const std::string& filename);
-
 
 int main(const int argc,const char* argv[])
@@ -50 +50 @@
   teststatus|=check_default_results();
 
-  char* buf=std::getenv("srcdir");
-  assert(buf);
-  std::string srcdir(buf);
+  std::string srcdir=get_srcdir();
   std::stringstream system_call;
   system_call << "./nni -data default_results/wenni_logratio.data"
@@ -82 +80 @@
 bool check_default_results(void)
 {
-  char* buf=std::getenv("srcdir");
-  assert(buf);
-  std::string srcdir(buf);
+  std::string srcdir=get_srcdir();
 
   bool teststatus=false;
@@ -113 +109 @@
 bool check_knni_results(void)
 {
-  char* buf=std::getenv("srcdir");
-  assert(buf);
-  std::string srcdir(buf);
+  std::string srcdir=get_srcdir();
   bool teststatus=false;
   teststatus|=diff("knni_imputed.data",srcdir+"/../data/knni_imputed.data");
@@ -126 +120 @@
 bool check_raw_results(void)
 {
-  char* buf=std::getenv("srcdir");
-  assert(buf);
-  std::string srcdir(buf);
+  std::string srcdir=get_srcdir();
 
   bool teststatus=false;
@@ -161 +153 @@
 {
   bool teststatus=false;
-  char* buf=std::getenv("srcdir");
-  assert(buf);
-  std::string srcdir(buf);
+  std::string srcdir=get_srcdir();
   teststatus|=compare("wenni_imputed.data",srcdir+"/../data/wenni_imputed.data",
                       1.1e-11);
@@ -235 +225 @@
 
 
+std::string get_srcdir(void)
+{
+  char* buf=std::getenv("srcdir");
+  if (buf)
+    return buf;
+  return ".";
+  
+}
+
+
 bool rm(const std::string& filename) {
   if (unlink(filename.c_str())) {