diff --git a/configure.ac b/configure.ac index 171b5d305..9c9595a6d 100644 --- a/configure.ac +++ b/configure.ac @@ -109,6 +109,7 @@ AC_OUTPUT(Makefile \ test_problems/spectroscopy/Makefile \ test_problems/surfkin/Makefile \ test_problems/surfSolverTest/Makefile \ + test_problems/VPsilane_test/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 cce21848e..8cb22867b 100644 --- a/test_problems/Makefile.am +++ b/test_problems/Makefile.am @@ -1,11 +1,11 @@ -#SUBDIRS = VPsilance_test VCSnonideal +#SUBDIRS = VCSnonideal 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 pureFluidTest silane_equil -SUBDIRS += spectroscopy surfkin surfSolverTest +SUBDIRS += spectroscopy surfkin surfSolverTest VPsilane_test # skipped (uses ck2cti or python): # ck2cti_test diff --git a/test_problems/VPsilane_test/Makefile.am b/test_problems/VPsilane_test/Makefile.am new file mode 100644 index 000000000..efdc073c5 --- /dev/null +++ b/test_problems/VPsilane_test/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = silane_equil.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 =VPsilane_test +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +VPsilane_test_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/VPsilane_test/runtest.in b/test_problems/VPsilane_test/runtest similarity index 97% rename from test_problems/VPsilane_test/runtest.in rename to test_problems/VPsilane_test/runtest index 474603001..ebace70ee 100755 --- a/test_problems/VPsilane_test/runtest.in +++ b/test_problems/VPsilane_test/runtest @@ -31,9 +31,11 @@ fi if [ $retnStat = "0" ] then echo "successful diff comparison on VPsilane_test test" + return 0 else echo "unsuccessful diff comparison on VPsilane_test test" echo "FAILED" > csvCode.txt temp_success="0" + return 1 fi diff --git a/test_problems/VPsilane_test/silane_equil.cpp b/test_problems/VPsilane_test/silane_equil.cpp index cead069de..c64f5ec64 100644 --- a/test_problems/VPsilane_test/silane_equil.cpp +++ b/test_problems/VPsilane_test/silane_equil.cpp @@ -11,9 +11,9 @@ #include "Cantera.h" #include "IdealGasMix.h" #include "equilibrium.h" -#include "kernel/IdealSolnGasVPSS.h" -#include "kernel/ThermoFactory.h" -#include "kernel/PrintCtrl.h" +#include "IdealSolnGasVPSS.h" +#include "ThermoFactory.h" +#include "PrintCtrl.h" using namespace std; using namespace Cantera;