Changeset 855:8c44b64dd436 in lemon-0.x for src

Timestamp:

09/15/04 13:50:50 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1155

Message:

Better handling of the input files of the tests.

Location:

src/test

Files:

• Makefile.am (modified) (3 diffs)
• preflow_test.cc (modified) (2 diffs)

src/test/Makefile.am

@@ -1 +1 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src
 
-#dist_noinst_DATA = preflow_graph
-EXTRA_DIST = preflow_graph.inp
-CLEANFILES = preflow_graph.out
+EXTRA_DIST = preflow_graph.inp #input file for preflow_test.cc
 
 noinst_HEADERS = test_tools.h graph_test.h
@@ -24 +22 @@
         xy_test
 
-SUFFIXES = .inp .out
-.inp.out:
-        -cp $< $@
-
 TESTS = $(check_PROGRAMS)
 XFAIL_TESTS = test_tools_fail
@@ -41 +35 @@
 path_test_SOURCES = path_test.cc
 preflow_test_SOURCES = preflow_test.cc
-preflow_test_DEPENDENCIES = preflow_graph.out
 time_measure_test_SOURCES = time_measure_test.cc
 test_tools_fail_SOURCES = test_tools_fail.cc

src/test/preflow_test.cc

@@ -6 +6 @@
 #include <hugo/skeletons/graph.h>
 #include <hugo/skeletons/maps.h>
+
+#include <string.h>
+
 using namespace hugo;
 
@@ -67 +70 @@
   typedef Preflow<Graph, int> PType;
 
-  std::ifstream file("preflow_graph.out");
+  char *f_name;
+  
+  f_name=new char[strlen(getenv("srcdir"))+50];
+  strcpy(f_name,getenv("srcdir"));
+  strcat(f_name,"/preflow_graph.inp");
+  
+  std::ifstream file(f_name);
+  
+  check(file,"Input file '" << f_name << "' not found.");
+  
+  delete [] f_name;
   
   Graph G;