[Echempp-devel] Experiment/ExcitationFunction/test Makefile.am, 1.19, 1.20 excitationFunctionTest.c
Status: Beta
Brought to you by:
berndspeiser
|
From: Bernd S. <ber...@us...> - 2007-05-14 15:38:29
|
Update of /cvsroot/echempp/Experiment/ExcitationFunction/test
In directory sc8-pr-cvs17:/tmp/cvs-serv31228/Experiment/ExcitationFunction/test
Modified Files:
Makefile.am excitationFunctionTest.cpp
Log Message:
testing xml input failure
Index: excitationFunctionTest.cpp
===================================================================
RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/test/excitationFunctionTest.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** excitationFunctionTest.cpp 17 Feb 2007 18:03:16 -0000 1.20
--- excitationFunctionTest.cpp 14 May 2007 15:38:19 -0000 1.21
***************
*** 1013,1018 ****
--- 1013,1021 ----
<< std::endl;
CVExcitationFunction cv_xmlload;
+ std::cout << " CVExcitationFunction object generated!" << std::endl;
+ /*
try {
TiXmlHandle root = BSUtilities::xmlr::xmlInit (xmlsave_ef_filename);
+
cv_xmlload.load (root);
BSUtilities::xmlr::xmlFinish (root);
***************
*** 1030,1033 ****
--- 1033,1037 ----
<< " (expect: " << CV3.maximum () << ")" << std::endl;
std::cout << std::endl;
+ */
EtExcitationFunction et_xmlsave (HR);
Index: Makefile.am
===================================================================
RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/test/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Makefile.am 23 Nov 2006 09:15:54 -0000 1.19
--- Makefile.am 14 May 2007 15:38:19 -0000 1.20
***************
*** 6,10 ****
-lQuantity \
-L$(BSUTILITIESLIB) -lBSUtilities \
! -L$(LOKILIB) -lloki
segmentsTest_SOURCES = segmentsTest.cpp
--- 6,10 ----
-lQuantity \
-L$(BSUTILITIESLIB) -lBSUtilities \
! -L$(LOKILIB) -lloki -lboost_serialization
segmentsTest_SOURCES = segmentsTest.cpp
***************
*** 27,31 ****
-lQuantity \
-L$(BSUTILITIESLIB) -lBSUtilities \
! -L$(LOKILIB) -lloki
INCLUDES = -I../.. \
--- 27,31 ----
-lQuantity \
-L$(BSUTILITIESLIB) -lBSUtilities \
! -L$(LOKILIB) -lloki -lboost_serialization
INCLUDES = -I../.. \
***************
*** 34,44 ****
-I$(BSUTILITIESSRC)
loadFunctionsTest_CXXFLAGS = -Wall -Werror -pedantic-errors \
! -DTIXML_USE_STL=YES
segmentsTest_CXXFLAGS = -Wall -Werror -pedantic-errors \
-DTIXML_USE_STL=YES
excitationFunctionTest_CXXFLAGS = -Wall -Werror -pedantic-errors \
! -DTIXML_USE_STL=YES
excitationFunctionTimingTest_CXXFLAGS = -Wall -Werror -pedantic-errors \
-DTIXML_USE_STL=YES
--- 34,54 ----
-I$(BSUTILITIESSRC)
+ # -Wno-parentheses is needed due to boost::serialization
+ # -Wno-unused-parameter is needed due to boost::serialization
loadFunctionsTest_CXXFLAGS = -Wall -Werror -pedantic-errors \
! -DTIXML_USE_STL=YES \
! -Wno-unused-parameter\
! -Wno-parentheses
segmentsTest_CXXFLAGS = -Wall -Werror -pedantic-errors \
-DTIXML_USE_STL=YES
+
+ # -Wno-parentheses is needed due to boost::serialization
+ # -Wno-unused-parameter is needed due to boost::serialization
excitationFunctionTest_CXXFLAGS = -Wall -Werror -pedantic-errors \
! -DTIXML_USE_STL=YES\
! -Wno-unused-parameter\
! -Wno-parentheses
!
excitationFunctionTimingTest_CXXFLAGS = -Wall -Werror -pedantic-errors \
-DTIXML_USE_STL=YES
|