diff --git a/configure.ac b/configure.ac index d5a980252..c1f76ae82 100644 --- a/configure.ac +++ b/configure.ac @@ -103,6 +103,7 @@ AC_OUTPUT(Makefile \ test_problems/multiGasTransport/Makefile \ test_problems/negATest/Makefile \ test_problems/NASA9poly_test/Makefile \ + test_problems/printUtilUnitTest/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 4de188647..a8829d8f8 100644 --- a/test_problems/Makefile.am +++ b/test_problems/Makefile.am @@ -1,25 +1,11 @@ #SUBDIRS = surfkin silane_equil VPsilance_test \ - diamondSurf_dupl surfSolverTest \ - ChemEquil_gri_matrix ChemEquil_gri_pairs \ - mixGasTransport printUtilUnitTest + diamondSurf_dupl surfSolverTest 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 - -# -# would be good to add: -# -# pureFluidTest -# rankine_democxx -# min_python -# -# -# cathermo -# VCSnonideal - +SUBDIRS += negATest printUtilUnitTest # skipped: # ck2cti_test diff --git a/test_problems/printUtilUnitTest/Makefile.am b/test_problems/printUtilUnitTest/Makefile.am new file mode 100644 index 000000000..7b824815e --- /dev/null +++ b/test_problems/printUtilUnitTest/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = pUtest.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 = pUtest +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +pUtest_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/printUtilUnitTest/pUtest.cpp b/test_problems/printUtilUnitTest/pUtest.cpp index 59b59a5dc..763babf66 100644 --- a/test_problems/printUtilUnitTest/pUtest.cpp +++ b/test_problems/printUtilUnitTest/pUtest.cpp @@ -7,8 +7,8 @@ #include #include "Cantera.h" -#include "kernel/PrintCtrl.h" -#include "kernel/LogPrintCtrl.h" +#include "PrintCtrl.h" +#include "LogPrintCtrl.h" using namespace Cantera; using namespace std; diff --git a/test_problems/printUtilUnitTest/runtest b/test_problems/printUtilUnitTest/runtest index dbbc2ba6d..4e6b0bf6d 100755 --- a/test_problems/printUtilUnitTest/runtest +++ b/test_problems/printUtilUnitTest/runtest @@ -26,9 +26,11 @@ retnStat=$? if [ $retnStat = "0" ] then echo "successful diff comparison on $tname test" + return 0 else echo "unsuccessful diff comparison on $tname test" echo "FAILED" > csvCode.txt temp_success="0" + return 1 fi