From aa02a1a6992d4e76dc682fa2a442f34518ad9e79 Mon Sep 17 00:00:00 2001
From: Nicholas Malaya <nicholas.malaya@gmail.com>
Date: Tue, 7 Feb 2012 17:11:49 +0000
Subject: [PATCH] [cantera]: adding pure fluid test

---
 Cantera/cxx/include/PureFluid.h         |  4 ++--
 ChangeLog                               |  1 +
 configure.ac                            |  1 +
 test_problems/Makefile.am               |  3 ++-
 test_problems/pureFluidTest/Makefile.am | 23 +++++++++++++++++++++++
 test_problems/pureFluidTest/runtest     |  2 ++
 6 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 test_problems/pureFluidTest/Makefile.am

diff --git a/Cantera/cxx/include/PureFluid.h b/Cantera/cxx/include/PureFluid.h
index ce7ec4c9e..91b7ca8ed 100644
--- a/Cantera/cxx/include/PureFluid.h
+++ b/Cantera/cxx/include/PureFluid.h
@@ -6,9 +6,9 @@
 
 #include <string>
 
-#include "kernel/PureFluidPhase.h"
+#include "PureFluidPhase.h"
 #include "kinetics.h"
-#include "kernel/stringUtils.h"
+#include "stringUtils.h"
 
 namespace Cantera {
 
diff --git a/ChangeLog b/ChangeLog
index a43a08899..c6cb9b751 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 2011-11-10 15:09 nick
 
 	* major overhaul of build system to use GNU autotools
+	* make check now supports nearly all tests
 
 2008-01-07 15:02  hkmoffa
 
diff --git a/configure.ac b/configure.ac
index c1f76ae82..6c57c7541 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,6 +104,7 @@ AC_OUTPUT(Makefile                                                         \
                    test_problems/negATest/Makefile                         \
                    test_problems/NASA9poly_test/Makefile                   \
                    test_problems/printUtilUnitTest/Makefile                \
+                   test_problems/pureFluidTest/Makefile                    \
                    test_problems/cathermo/Makefile                         \
                    test_problems/cathermo/DH_graph_1/Makefile              \
                    test_problems/cathermo/DH_graph_acommon/Makefile        \
diff --git a/test_problems/Makefile.am b/test_problems/Makefile.am
index a8829d8f8..11e3f1f05 100644
--- a/test_problems/Makefile.am
+++ b/test_problems/Makefile.am
@@ -5,11 +5,12 @@
 SUBDIRS  = cathermo mixGasTransport ChemEquil_gri_matrix ChemEquil_gri_pairs
 SUBDIRS += ChemEquil_ionizedGas ChemEquil_red1 CpJump cxx_ex diamondSurf 
 SUBDIRS += diamondSurf_dupl fracCoeff multiGasTransport NASA9poly_test
-SUBDIRS += negATest printUtilUnitTest 
+SUBDIRS += negATest printUtilUnitTest pureFluidTest 
 
 # skipped:
 # ck2cti_test
 # nasa9_reader (uses ck2cti)
+# python
 
 EXTRA_DIST =
 
diff --git a/test_problems/pureFluidTest/Makefile.am b/test_problems/pureFluidTest/Makefile.am
new file mode 100644
index 000000000..94d5fb54e
--- /dev/null
+++ b/test_problems/pureFluidTest/Makefile.am
@@ -0,0 +1,23 @@
+cc_sources = testPureWater.cpp
+
+INC                  = -I. -I$(top_builddir)/build/include/
+AM_CPPFLAGS          = $(INC)
+AM_CXXFLAGS          = $(AM_CPPFLAGS)
+
+LINK                 = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo 
+LINK                += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode 
+LINK                += -lctlapack -lctblas -lctf2c -lctcxx -lm  -lctf2c -lstdc++
+AM_LDFLAGS           = -L$(top_builddir)/build/lib/ 
+LIBS                 =  $(LINK)
+
+bin_PROGRAMS         = testPureWater
+library_includedir   = $(INC)
+
+#-----------------------
+# Cantera DH graph test
+#-----------------------
+
+testPureWater_SOURCES = $(cc_sources)
+
+TESTS_ENVIRONMENT = 
+TESTS             = runtest
diff --git a/test_problems/pureFluidTest/runtest b/test_problems/pureFluidTest/runtest
index 1e805529a..5f00f43ef 100755
--- a/test_problems/pureFluidTest/runtest
+++ b/test_problems/pureFluidTest/runtest
@@ -25,9 +25,11 @@ retnStat=$?
 if [ $retnStat = "0" ]
 then
   echo "successful diff comparison on $testName test"
+  return 0
 else
   echo "unsuccessful diff comparison on $testName test"
   echo "FAILED" > csvCode.txt
   temp_success="0"
+  return 1
 fi