[Avida-cvs] [avida-svn] r820 - in development: . source source/archive source/targets/avida source/targets/avida-viewer source/testsuites source/third-party source/tools support/utils/AvidaUtils
kaben@myxo.css.msu.edu
kaben at myxo.css.msu.edu
Mon Jul 10 18:40:31 PDT 2006
Author: kaben
Date: 2006-07-10 21:40:30 -0400 (Mon, 10 Jul 2006)
New Revision: 820
Added:
development/source/tools/lightweight_test.h
Modified:
development/CMakeLists.txt
development/SConstruct
development/source/SConscript
development/source/archive/cXMLArchive.cc
development/source/targets/avida-viewer/SConscript
development/source/targets/avida/SConscript
development/source/testsuites/SConscript
development/source/third-party/SConscript
development/source/tools/cChangeList.cc
development/source/tools/cDataEntry.cc
development/source/tools/cDataFile.cc
development/source/tools/cFile.cc
development/source/tools/cFixedBlock.cc
development/source/tools/cFixedCoords.cc
development/source/tools/cInitFile.cc
development/source/tools/cRandom.cc
development/source/tools/cString.cc
development/source/tools/cStringList.cc
development/source/tools/nTemplateTests.cc
development/support/utils/AvidaUtils/CmdLineOpts.py
development/support/utils/AvidaUtils/PlatformTool.py
Log:
- Removed depends on boost for unit test macros.
- Disabled serialization.
Modified: development/CMakeLists.txt
===================================================================
--- development/CMakeLists.txt 2006-07-10 18:51:39 UTC (rev 819)
+++ development/CMakeLists.txt 2006-07-11 01:40:30 UTC (rev 820)
@@ -113,6 +113,11 @@
ELSE(EXISTS ${PROJECT_SOURCE_DIR}/source/archive)
SET(AVD_SERIALIZATION FALSE)
ENDIF(EXISTS ${PROJECT_SOURCE_DIR}/source/archive)
+IF(AVD_SERIALIZATION)
+ ADD_DEFINITIONS(-DENABLE_SERIALIZATION=1)
+ELSE(AVD_SERIALIZATION)
+ REMOVE_DEFINITIONS(-DENABLE_SERIALIZATION=1)
+ENDIF(AVD_SERIALIZATION)
# Experimental Boost.Python interface to avida is disabled by default.
OPTION(AVD_PY_BINDINGS
@@ -237,7 +242,7 @@
ADD_DEFINITIONS(-DUSE_tMemTrack=1)
ENABLE_TESTING()
ELSE(AVD_UNIT_TESTS)
- REMOVE_DEFINITIONS(_DENABLE_UNIT_TESTS)
+ REMOVE_DEFINITIONS(-DENABLE_UNIT_TESTS)
REMOVE_DEFINITIONS(-DUSE_tMemTrack=1)
ENDIF(AVD_UNIT_TESTS)
Modified: development/SConstruct
===================================================================
--- development/SConstruct 2006-07-10 18:51:39 UTC (rev 819)
+++ development/SConstruct 2006-07-11 01:40:30 UTC (rev 820)
@@ -30,6 +30,9 @@
#
AvidaUtils.Configure(ARGUMENTS, environment)
+if environment.subst('$enableSerialization') in ['1', 'yes']:
+ environment.Append(CPPDEFINES = ['ENABLE_SERIALIZATION=1'])
+
if environment.subst('$enableTestCode') in ['1', 'yes']:
environment.SetDefault(enableSharedPtr = 1)
environment.Append(CPPDEFINES = ['USE_tMemTrack=1', 'ENABLE_UNIT_TESTS=1'])
@@ -57,7 +60,7 @@
LIBPATH = [
'#$buildDir/actions',
'#$buildDir/analyze',
- '#$buildDir/archive',
+ #'#$buildDir/archive',
'#$buildDir/classification',
'#$buildDir/cpu',
'#$buildDir/drivers',
Modified: development/source/SConscript
===================================================================
--- development/source/SConscript 2006-07-10 18:51:39 UTC (rev 819)
+++ development/source/SConscript 2006-07-11 01:40:30 UTC (rev 820)
@@ -4,7 +4,7 @@
environment.SConscript( [
'actions/SConscript',
'analyze/SConscript',
- 'archive/SConscript',
+ #'archive/SConscript',
'classification/SConscript',
'cpu/SConscript',
'drivers/SConscript',
Modified: development/source/archive/cXMLArchive.cc
===================================================================
--- development/source/archive/cXMLArchive.cc 2006-07-10 18:51:39 UTC (rev 819)
+++ development/source/archive/cXMLArchive.cc 2006-07-11 01:40:30 UTC (rev 820)
@@ -1,6 +1,8 @@
#include "cXMLArchive.h"
+#ifdef ENABLE_SERIALIZATION
+
// explicitly instantiate for this type of xml stream
#include <boost/archive/impl/basic_xml_iarchive.ipp>
#include <boost/archive/impl/archive_pointer_iserializer.ipp>
@@ -16,3 +18,4 @@
template class boost::archive::detail::archive_pointer_oserializer<cXMLOArchive> ;
template class boost::archive::xml_oarchive_impl<cXMLOArchive> ;
+#endif // ENABLE_SERIALIZATION
Modified: development/source/targets/avida/SConscript
===================================================================
--- development/source/targets/avida/SConscript 2006-07-10 18:51:39 UTC (rev 819)
+++ development/source/targets/avida/SConscript 2006-07-11 01:40:30 UTC (rev 820)
@@ -19,8 +19,8 @@
'tools',
'actions',
'analyze',
- 'archive',
- 'boost_serialization',
+ #'archive',
+ #'boost_serialization',
'main',
]
if environment['PLATFORM'] not in ('win32'):
Modified: development/source/targets/avida-viewer/SConscript
===================================================================
--- development/source/targets/avida-viewer/SConscript 2006-07-10 18:51:39 UTC (rev 819)
+++ development/source/targets/avida-viewer/SConscript 2006-07-11 01:40:30 UTC (rev 820)
@@ -34,8 +34,8 @@
'analyze',
'ncurses',
'pthread',
- 'archive',
- 'boost_serialization',
+ #'archive',
+ #'boost_serialization',
'main',
]
if environment['enableTCMalloc'] in ('True', '1', 1):
Modified: development/source/testsuites/SConscript
===================================================================
--- development/source/testsuites/SConscript 2006-07-10 18:51:39 UTC (rev 819)
+++ development/source/testsuites/SConscript 2006-07-11 01:40:30 UTC (rev 820)
@@ -36,8 +36,8 @@
'tools',
'actions',
'main',
- 'archive',
- 'boost_serialization',
+ #'archive',
+ #'boost_serialization',
]
Test(environment, 'full-unit-tests', 'full-unit-tests.cc', LIBS = all_libs)
Modified: development/source/third-party/SConscript
===================================================================
--- development/source/third-party/SConscript 2006-07-10 18:51:39 UTC (rev 819)
+++ development/source/third-party/SConscript 2006-07-11 01:40:30 UTC (rev 820)
@@ -3,7 +3,7 @@
SConscript(
[
- 'boost/serialization/SConscript',
+ #'boost/serialization/SConscript',
]
)
Modified: development/source/tools/cChangeList.cc
===================================================================
--- development/source/tools/cChangeList.cc 2006-07-10 18:51:39 UTC (rev 819)
+++ development/source/tools/cChangeList.cc 2006-07-11 01:40:30 UTC (rev 820)
@@ -68,7 +68,7 @@
#include "cFile.h"
#include "cXMLArchive.h"
-#include <boost/detail/lightweight_test.hpp>
+#include "lightweight_test.h"
#include <cstdio> // for std::remove() to remove temporary files.
#include <iomanip>
@@ -97,13 +97,16 @@
namespace utChangeList_hello_world {
void test(){
- BOOST_TEST(true);
- BOOST_TEST(false);
+ std::cout << CURRENT_FUNCTION << std::endl;
+ TEST(true);
+ TEST(false);
}
}
namespace utChangeList_archiving {
void test(){
+# ifdef ENABLE_SERIALIZATION
+ std::cout << CURRENT_FUNCTION << std::endl;
std::string filename("./cChangeList_basic_serialization.xml");
int changelist_size = 10;
int change_count = 5;
@@ -111,15 +114,15 @@
{
cChangeList cl(changelist_size);
- BOOST_TEST(cl.GetSize() == changelist_size);
+ TEST(cl.GetSize() == changelist_size);
- BOOST_TEST(cl.GetChangeCount() == 0);
+ TEST(cl.GetChangeCount() == 0);
cl.PushChange(1);
cl.PushChange(7);
cl.PushChange(3);
cl.PushChange(5);
cl.PushChange(2);
- BOOST_TEST(cl.GetChangeCount() == change_count);
+ TEST(cl.GetChangeCount() == change_count);
for(int i = 0; i < change_count; i++) {
recorded_changes[i] = cl.CheckChangeAt(i);
@@ -129,17 +132,18 @@
{
cChangeList cl;
- BOOST_TEST(cl.GetSize() == 0);
- BOOST_TEST(cl.GetChangeCount() == 0);
+ TEST(cl.GetSize() == 0);
+ TEST(cl.GetChangeCount() == 0);
restore_stuff<>(cl, filename.c_str());
- BOOST_TEST(cl.GetChangeCount() == change_count);
+ TEST(cl.GetChangeCount() == change_count);
for(int i = 0; i < change_count; i++) {
- BOOST_TEST(recorded_changes[i] == cl.CheckChangeAt(i));
+ TEST(recorded_changes[i] == cl.CheckChangeAt(i));
}
}
std::remove(filename.c_str());
+# endif // ENABLE_SERIALIZATION
}
} // utChangeList_archiving
@@ -147,14 +151,8 @@
void UnitTests(bool full)
{
- //if(full) {
- // std::cout << "utChangeList_hello_world" << std::endl;
- // utChangeList_hello_world::test();
- //}
- if(full) {
- std::cout << "utChangeList_archiving" << std::endl;
- utChangeList_archiving::test();
- }
+ //if(full) utChangeList_hello_world::test();
+ if(full) utChangeList_archiving::test();
}
} // nChangeList
Modified: development/source/tools/cDataEntry.cc
===================================================================
--- development/source/tools/cDataEntry.cc 2006-07-10 18:51:39 UTC (rev 819)
+++ development/source/tools/cDataEntry.cc 2006-07-11 01:40:30 UTC (rev 820)
@@ -16,7 +16,7 @@
*/
#include "cXMLArchive.h"
-#include <boost/detail/lightweight_test.hpp>
+#include "lightweight_test.h"
#include <cstdio> // for std::remove() to remove temporary files.
#include <iomanip>
@@ -45,13 +45,16 @@
namespace utDataEntry_hello_world {
void test(){
- BOOST_TEST(true);
- BOOST_TEST(false);
+ std::cout << CURRENT_FUNCTION << std::endl;
+ TEST(true);
+ TEST(false);
}
}
namespace utDataEntry_archiving {
void test(){
+# ifdef ENABLE_SERIALIZATION
+ std::cout << CURRENT_FUNCTION << std::endl;
std::string filename("./cDataEntry_basic_serialization.xml");
// Open cDataEntry_data.txt for reading.
@@ -59,15 +62,15 @@
cDataEntry d1("n", "d", "nv", "htf");
// Sanity checks...
- BOOST_TEST(cString("name") == d.GetName());
- BOOST_TEST(cString("desc") == d.GetDesc());
- BOOST_TEST(cString("null_value") == d.GetNull());
- BOOST_TEST(cString("html_table_flags") == d.GetHtmlCellFlags());
+ TEST(cString("name") == d.GetName());
+ TEST(cString("desc") == d.GetDesc());
+ TEST(cString("null_value") == d.GetNull());
+ TEST(cString("html_table_flags") == d.GetHtmlCellFlags());
- BOOST_TEST(cString("n") == d1.GetName());
- BOOST_TEST(cString("d") == d1.GetDesc());
- BOOST_TEST(cString("nv") == d1.GetNull());
- BOOST_TEST(cString("htf") == d1.GetHtmlCellFlags());
+ TEST(cString("n") == d1.GetName());
+ TEST(cString("d") == d1.GetDesc());
+ TEST(cString("nv") == d1.GetNull());
+ TEST(cString("htf") == d1.GetHtmlCellFlags());
// Save cDataEntry state.
save_stuff<>(d, filename.c_str());
@@ -75,12 +78,13 @@
restore_stuff<>(d1, filename.c_str());
// Check reloaded state.
- BOOST_TEST(cString("name") == d1.GetName());
- BOOST_TEST(cString("desc") == d1.GetDesc());
- BOOST_TEST(cString("null_value") == d1.GetNull());
- BOOST_TEST(cString("html_table_flags") == d1.GetHtmlCellFlags());
+ TEST(cString("name") == d1.GetName());
+ TEST(cString("desc") == d1.GetDesc());
+ TEST(cString("null_value") == d1.GetNull());
+ TEST(cString("html_table_flags") == d1.GetHtmlCellFlags());
std::remove(filename.c_str());
+# endif // ENABLE_SERIALIZATION
}
} // utDataEntry_archiving
@@ -88,14 +92,8 @@
void UnitTests(bool full)
{
- //if(full) {
- // std::cout << "utDataEntry_hello_world" << std::endl;
- // utDataEntry_hello_world::test();
- //}
- if(full) {
- std::cout << "utDataEntry_archiving" << std::endl;
- utDataEntry_archiving::test();
- }
+ //if(full) utDataEntry_hello_world::test();
+ if(full) utDataEntry_archiving::test();
}
} // nDataEntry
Modified: development/source/tools/cDataFile.cc
===================================================================
--- development/source/tools/cDataFile.cc 2006-07-10 18:51:39 UTC (rev 819)
+++ development/source/tools/cDataFile.cc 2006-07-11 01:40:30 UTC (rev 820)
@@ -137,7 +137,7 @@
#include "cFile.h"
#include "cXMLArchive.h"
-#include <boost/detail/lightweight_test.hpp>
+#include "lightweight_test.h"
#include <cstdio> // for std::remove() to remove temporary files.
#include <iomanip>
@@ -166,13 +166,16 @@
namespace utDataFile_hello_world {
void test(){
- BOOST_TEST(true);
- BOOST_TEST(false);
+ utDataFile_hello_world::test();
+ TEST(true);
+ TEST(false);
}
}
namespace utDataFile_archiving {
void test(){
+# ifdef ENABLE_SERIALIZATION
+ std::cout << CURRENT_FUNCTION << std::endl;
std::string filename("./cDataFile_basic_serialization.xml");
int linecount = 3;
std::string data_file_name("./cDataFile_data.txt");
@@ -200,20 +203,20 @@
*/
{
cFile f(dfn);
- BOOST_TEST(f.Good());
+ TEST(f.Good());
cString l[7];
for(int i = 0; i<7; i++){
f.ReadLine(l[i]);
//std::cout << "\"" << l[i] << "\"" << std::endl;
}
- BOOST_TEST(cString("# Comment!") == l[0]);
- BOOST_TEST(cString("# 1: descr1") == l[1]);
- BOOST_TEST(cString("# 2: descr2") == l[2]);
- BOOST_TEST(cString("# 3: descr3") == l[3]);
- BOOST_TEST(cString("") == l[4]);
- BOOST_TEST(cString("1 1.000000 blah ") == l[5]);
- BOOST_TEST(cString("2 2 blahblah ") == l[6]);
+ TEST(cString("# Comment!") == l[0]);
+ TEST(cString("# 1: descr1") == l[1]);
+ TEST(cString("# 2: descr2") == l[2]);
+ TEST(cString("# 3: descr3") == l[3]);
+ TEST(cString("") == l[4]);
+ TEST(cString("1 1.000000 blah ") == l[5]);
+ TEST(cString("2 2 blahblah ") == l[6]);
}
/*
Reload the data file object, write another line of data ...
@@ -230,21 +233,21 @@
*/
{
cFile f(dfn);
- BOOST_TEST(f.Good());
+ TEST(f.Good());
cString l[8];
for(int i = 0; i<8; i++){
f.ReadLine(l[i]);
//std::cout << "\"" << l[i] << "\"" << std::endl;
}
- BOOST_TEST(cString("# Comment!") == l[0]);
- BOOST_TEST(cString("# 1: descr1") == l[1]);
- BOOST_TEST(cString("# 2: descr2") == l[2]);
- BOOST_TEST(cString("# 3: descr3") == l[3]);
- BOOST_TEST(cString("") == l[4]);
- BOOST_TEST(cString("1 1.000000 blah ") == l[5]);
- BOOST_TEST(cString("2 2 blahblah ") == l[6]);
- BOOST_TEST(cString("3 3 blahblahblah ") == l[7]);
+ TEST(cString("# Comment!") == l[0]);
+ TEST(cString("# 1: descr1") == l[1]);
+ TEST(cString("# 2: descr2") == l[2]);
+ TEST(cString("# 3: descr3") == l[3]);
+ TEST(cString("") == l[4]);
+ TEST(cString("1 1.000000 blah ") == l[5]);
+ TEST(cString("2 2 blahblah ") == l[6]);
+ TEST(cString("3 3 blahblahblah ") == l[7]);
}
/*
@@ -262,35 +265,30 @@
*/
{
cFile f(dfn);
- BOOST_TEST(f.Good());
+ TEST(f.Good());
cString l[4];
for(int i = 0; i<4; i++){
f.ReadLine(l[i]);
//std::cout << "\"" << l[i] << "\"" << std::endl;
}
- BOOST_TEST(cString("# This should be a new file.") == l[0]);
- BOOST_TEST(cString("# 1: newdescr") == l[1]);
- BOOST_TEST(cString("") == l[2]);
- BOOST_TEST(cString("1 ") == l[3]);
+ TEST(cString("# This should be a new file.") == l[0]);
+ TEST(cString("# 1: newdescr") == l[1]);
+ TEST(cString("") == l[2]);
+ TEST(cString("1 ") == l[3]);
}
std::remove(filename.c_str());
std::remove(data_file_name.c_str());
+# endif // ENABLE_SERIALIZATION
}
} // utDataFile_archiving
void UnitTests(bool full)
{
- //if(full) {
- // std::cout << "utDataFile_hello_world" << std::endl;
- // utDataFile_hello_world::test();
- //}
- if(full) {
- std::cout << "utDataFile_archiving" << std::endl;
- utDataFile_archiving::test();
- }
+ //if(full) utDataFile_hello_world::test();
+ if(full) utDataFile_archiving::test();
}
} // nDataFile
Modified: development/source/tools/cFile.cc
===================================================================
--- development/source/tools/cFile.cc 2006-07-10 18:51:39 UTC (rev 819)
+++ development/source/tools/cFile.cc 2006-07-11 01:40:30 UTC (rev 820)
@@ -85,7 +85,7 @@
*/
#include "cXMLArchive.h"
-#include <boost/detail/lightweight_test.hpp>
+#include "lightweight_test.h"
#include <cstdio> // for std::remove() to remove temporary files.
#include <iomanip>
@@ -114,13 +114,16 @@
namespace utFile_hello_world {
void test(){
- BOOST_TEST(true);
- BOOST_TEST(false);
+ std::cout << CURRENT_FUNCTION << std::endl;
+ TEST(true);
+ TEST(false);
}
}
namespace utFile_archiving {
void test(){
+# ifdef ENABLE_SERIALIZATION
+ std::cout << CURRENT_FUNCTION << std::endl;
std::string filename("./cFile_basic_serialization.xml");
int linecount = 3;
std::string data_file_name("./cFile_data.txt");
@@ -158,26 +161,29 @@
f.ReadLine(s3);
// Sanity checks...
- //BOOST_TEST(false);
- BOOST_TEST(cString("0") == s1);
- BOOST_TEST(cString("2") == s2);
- BOOST_TEST(cString("4") == s3);
+ //TEST(false);
+ TEST(cString("0") == s1);
+ TEST(cString("2") == s2);
+ TEST(cString("4") == s3);
// Verify reading expected lines from various reloaded states.
f3.ReadLine(l3);
f2.ReadLine(l2);
f1.ReadLine(l1);
- BOOST_TEST(l1 == s1);
- BOOST_TEST(l2 == s2);
- BOOST_TEST(l3 == s3);
+ TEST(l1 == s1);
+ TEST(l2 == s2);
+ TEST(l3 == s3);
std::remove(filename.c_str());
std::remove(data_file_name.c_str());
+# endif // ENABLE_SERIALIZATION
}
} // utFile_archiving
namespace utFile_archiving_closed_file {
void test(){
+# ifdef ENABLE_SERIALIZATION
+ std::cout << CURRENT_FUNCTION << std::endl;
std::string data_file_name("./cFile_data.txt");
{
std::ofstream data_file(data_file_name.c_str());
@@ -192,7 +198,7 @@
cFile f(data_file_name.c_str());
// Close file.
f.Close();
- BOOST_TEST(!f.IsOpen());
+ TEST(!f.IsOpen());
cFile f1;
@@ -201,12 +207,13 @@
// Reload state into new cFile.
restore_stuff<>(f1, filename.c_str());
// Verify new cFile has matching filename.
- BOOST_TEST(f.GetFilename() == f1.GetFilename());
+ TEST(f.GetFilename() == f1.GetFilename());
// Verify new cFile is closed.
- BOOST_TEST(!f1.IsOpen());
+ TEST(!f1.IsOpen());
std::remove(filename.c_str());
std::remove(data_file_name.c_str());
+# endif // ENABLE_SERIALIZATION
}
} // utFile_archiving_closed_file
@@ -216,18 +223,9 @@
void UnitTests(bool full)
{
- //if(full) {
- // std::cout << "utFile_hello_world" << std::endl;
- // utFile_hello_world::test();
- //}
- if(full) {
- std::cout << "utFile_archiving" << std::endl;
- utFile_archiving::test();
- }
- if(full) {
- std::cout << "utFile_archiving_closed_file" << std::endl;
- utFile_archiving_closed_file::test();
- }
+ //if(full) utFile_hello_world::test();
+ if(full) utFile_archiving::test();
+ if(full) utFile_archiving_closed_file::test();
}
} // nFile
Modified: development/source/tools/cFixedBlock.cc
===================================================================
--- development/source/tools/cFixedBlock.cc 2006-07-10 18:51:39 UTC (rev 819)
+++ development/source/tools/cFixedBlock.cc 2006-07-11 01:40:30 UTC (rev 820)
@@ -16,7 +16,7 @@
*/
#include "cXMLArchive.h"
-#include <boost/detail/lightweight_test.hpp>
+#include "lightweight_test.h"
#include <cstdio> // for std::remove() to remove temporary files.
#include <iomanip>
@@ -45,13 +45,16 @@
namespace utFixedBlock_hello_world {
void test(){
- BOOST_TEST(true);
- BOOST_TEST(false);
+ std::cout << CURRENT_FUNCTION << std::endl;
+ TEST(true);
+ TEST(false);
}
}
namespace utFixedBlock_archiving {
void test(){
+# ifdef ENABLE_SERIALIZATION
+ std::cout << CURRENT_FUNCTION << std::endl;
std::string filename("./cFixedBlock_basic_serialization.xml");
/*
@@ -59,9 +62,9 @@
*/
{
cFixedBlock fb;
- BOOST_TEST(0 == fb.GetStart());
+ TEST(0 == fb.GetStart());
fb.SetStart(2);
- BOOST_TEST(2 == fb.GetStart());
+ TEST(2 == fb.GetStart());
save_stuff<>(fb, filename.c_str());
}
/*
@@ -69,26 +72,21 @@
*/
{
cFixedBlock fb;
- BOOST_TEST(0 == fb.GetStart());
+ TEST(0 == fb.GetStart());
restore_stuff<>(fb, filename.c_str());
- BOOST_TEST(2 == fb.GetStart());
+ TEST(2 == fb.GetStart());
}
std::remove(filename.c_str());
+# endif // ENABLE_SERIALIZATION
}
} // utFixedBlock_archiving
void UnitTests(bool full)
{
- //if(full) {
- // std::cout << "utFixedBlock_hello_world" << std::endl;
- // utFixedBlock_hello_world::test();
- //}
- if(full) {
- std::cout << "utFixedBlock_archiving" << std::endl;
- utFixedBlock_archiving::test();
- }
+ //if(full) utFixedBlock_hello_world::test();
+ if(full) utFixedBlock_archiving::test();
}
} // nFixedBlock
Modified: development/source/tools/cFixedCoords.cc
===================================================================
--- development/source/tools/cFixedCoords.cc 2006-07-10 18:51:39 UTC (rev 819)
+++ development/source/tools/cFixedCoords.cc 2006-07-11 01:40:30 UTC (rev 820)
@@ -45,6 +45,7 @@
namespace utFixedCoords_hello_world {
void test(){
+ std::cout << "utFixedCoords_hello_world" << std::endl;
BOOST_TEST(true);
BOOST_TEST(false);
}
@@ -52,6 +53,8 @@
namespace utFixedCoords_archiving {
void test(){
+# ifdef ENABLE_SERIALIZATION
+ std::cout << "utFixedCoords_archiving" << std::endl;
std::string filename("./cFixedCoords_basic_serialization.xml");
/*
@@ -79,20 +82,15 @@
}
std::remove(filename.c_str());
+# endif // ENABLE_SERIALIZATION
}
} // utFixedCoords_archiving
void UnitTests(bool full)
{
- //if(full) {
- // std::cout << "utFixedCoords_hello_world" << std::endl;
- // utFixedCoords_hello_world::test();
- //}
- if(full) {
- std::cout << "utFixedCoords_archiving" << std::endl;
- utFixedCoords_archiving::test();
- }
+ //if(full) utFixedCoords_hello_world::test();
+ if(full) utFixedCoords_archiving::test();
}
} // nFixedCoords
Modified: development/source/tools/cInitFile.cc
===================================================================
--- development/source/tools/cInitFile.cc 2006-07-10 18:51:39 UTC (rev 819)
+++ development/source/tools/cInitFile.cc 2006-07-11 01:40:30 UTC (rev 820)
@@ -260,7 +260,7 @@
*/
#include "cXMLArchive.h"
-#include <boost/detail/lightweight_test.hpp>
+#include "lightweight_test.h"
#include <cstdio> // for std::remove() to remove temporary files.
#include <iomanip>
@@ -289,13 +289,16 @@
namespace utInitFile_hello_world {
void test(){
- BOOST_TEST(true);
- BOOST_TEST(false);
+ std::cout << CURRENT_FUNCTION << std::endl;
+ TEST(true);
+ TEST(false);
}
}
namespace utInitFile_archiving {
void test(){
+# ifdef ENABLE_SERIALIZATION
+ std::cout << CURRENT_FUNCTION << std::endl;
int linecount = 3;
std::string data_file_name("./cInitFile_data.txt");
{
@@ -334,26 +337,29 @@
f.ReadLine(s3);
// Sanity checks...
- //BOOST_TEST(false);
- BOOST_TEST(cString("0") == s1);
- BOOST_TEST(cString("2") == s2);
- BOOST_TEST(cString("4") == s3);
+ //TEST(false);
+ TEST(cString("0") == s1);
+ TEST(cString("2") == s2);
+ TEST(cString("4") == s3);
// Verify reading expected lines from various reloaded states.
f3.ReadLine(l3);
f2.ReadLine(l2);
f1.ReadLine(l1);
- BOOST_TEST(l1 == s1);
- BOOST_TEST(l2 == s2);
- BOOST_TEST(l3 == s3);
+ TEST(l1 == s1);
+ TEST(l2 == s2);
+ TEST(l3 == s3);
std::remove(filename.c_str());
std::remove(data_file_name.c_str());
+# endif // ENABLE_SERIALIZATION
}
} // utInitFile_archiving
namespace utInitFile_archiving_closed_file {
void test(){
+# ifdef ENABLE_SERIALIZATION
+ std::cout << CURRENT_FUNCTION << std::endl;
std::string data_file_name("./cInitFile_data.txt");
{
std::ofstream data_file(data_file_name.c_str());
@@ -369,7 +375,7 @@
f.Load();
f.Compress();
f.Close();
- BOOST_TEST(!f.IsOpen());
+ TEST(!f.IsOpen());
cInitFile f1;
@@ -378,12 +384,13 @@
// Reload state into new cInitFile.
restore_stuff<>(f1, filename.c_str());
// Verify new cInitFile has matching filename.
- BOOST_TEST(f.GetFilename() == f1.GetFilename());
+ TEST(f.GetFilename() == f1.GetFilename());
// Verify new cInitFile is closed.
- BOOST_TEST(!f1.IsOpen());
+ TEST(!f1.IsOpen());
std::remove(filename.c_str());
std::remove(data_file_name.c_str());
+# endif // ENABLE_SERIALIZATION
}
} // utInitFile_archiving_closed_file
@@ -394,6 +401,7 @@
*/
namespace utInitFile_ReadString_after_open_and_close {
void test(){
+ std::cout << CURRENT_FUNCTION << std::endl;
std::string data_file_name("./utInitFile_ReadString_after_open_and_close.cfg");
{
std::ofstream data_file(data_file_name.c_str());
@@ -413,8 +421,8 @@
const cString default_val("ICK");
const cString loaded_val(f.ReadString(keyword, default_val));
const cString expected_val("BLAH");
- BOOST_TEST(!f.IsOpen());
- BOOST_TEST(loaded_val == expected_val);
+ TEST(!f.IsOpen());
+ TEST(loaded_val == expected_val);
std::cout << "utInitFile_ReadString_after_open_and_close:" << std::endl;
std::cout << " keyword: " << keyword << std::endl;
std::cout << " default_val: " << default_val << std::endl;
@@ -430,22 +438,10 @@
void UnitTests(bool full)
{
- //if(full) {
- // std::cout << "utInitFile_hello_world" << std::endl;
- // utInitFile_hello_world::test();
- //}
- if(full) {
- std::cout << "utInitFile_archiving" << std::endl;
- utInitFile_archiving::test();
- }
- if(full) {
- std::cout << "utInitFile_archiving_closed_file" << std::endl;
- utInitFile_archiving_closed_file::test();
- }
- if(1) {
- std::cout << "utInitFile_ReadString_after_open_and_close" << std::endl;
- utInitFile_ReadString_after_open_and_close::test();
- }
+ //if(full) utInitFile_hello_world::test();
+ if(full) utInitFile_archiving::test();
+ if(full) utInitFile_archiving_closed_file::test();
+ if(1) utInitFile_ReadString_after_open_and_close::test();
}
} // nInitFile
Modified: development/source/tools/cRandom.cc
===================================================================
--- development/source/tools/cRandom.cc 2006-07-10 18:51:39 UTC (rev 819)
+++ development/source/tools/cRandom.cc 2006-07-11 01:40:30 UTC (rev 820)
@@ -263,7 +263,7 @@
*/
#include "cXMLArchive.h"
-#include <boost/detail/lightweight_test.hpp>
+#include "lightweight_test.h"
#include <cstdio> // for std::remove() to remove temporary files.
#include <iomanip>
@@ -292,13 +292,16 @@
namespace utRandom_hello_world {
void test(){
- BOOST_TEST(true);
- BOOST_TEST(false);
+ std::cout << CURRENT_FUNCTION << std::endl;
+ TEST(true);
+ TEST(false);
}
}
namespace utRandom_archiving {
- void test(){
+ void test() {
+# ifdef ENABLE_SERIALIZATION
+ std::cout << CURRENT_FUNCTION << std::endl;
{
std::string filename("./cRandom_basic_serialization.xml");
@@ -374,27 +377,27 @@
unsigned int rb2 = r2.GetRandBinomial(10.0, 3.0);
/* Compare results. */
- BOOST_TEST(seed2 == seed);
- BOOST_TEST(original_seed2 == original_seed);
- BOOST_TEST(d2 == d);
- BOOST_TEST(dm2 == dm);
- BOOST_TEST(dr2 == dr);
- BOOST_TEST(i2 == i);
- BOOST_TEST(ir2 == ir);
- BOOST_TEST(p2 == p);
- BOOST_TEST(up2 == up);
+ TEST(seed2 == seed);
+ TEST(original_seed2 == original_seed);
+ TEST(d2 == d);
+ TEST(dm2 == dm);
+ TEST(dr2 == dr);
+ TEST(i2 == i);
+ TEST(ir2 == ir);
+ TEST(p2 == p);
+ TEST(up2 == up);
for(int i = 0; i < choose.GetSize(); i++){
- BOOST_TEST(choose2[i] == choose[i]);
+ TEST(choose2[i] == choose[i]);
}
- BOOST_TEST(rn2 == rn);
- BOOST_TEST(rnr2 == rnr);
- BOOST_TEST(rpnp2 == rpnp);
- BOOST_TEST(rpm2 == rpm);
+ TEST(rn2 == rn);
+ TEST(rnr2 == rnr);
+ TEST(rpnp2 == rpnp);
+ TEST(rpm2 == rpm);
//std::cout<<"rnr2: "<<rnr2<<", rnr: "<<rnr<<std::endl;
//std::cout<<"rpnp2: "<<rpnp2<<", rpnp: "<<rpnp<<std::endl;
//std::cout<<"rpm2: "<<rpm2<<", rpm: "<<rpm<<std::endl;
- BOOST_TEST(frb2 == frb);
- BOOST_TEST(rb2 == rb);
+ TEST(frb2 == frb);
+ TEST(rb2 == rb);
/*
Print random number seeds to stdout, in case we run across a seed
@@ -406,16 +409,14 @@
std::remove(filename.c_str());
}
+# endif // ENABLE_SERIALIZATION
}
}
void UnitTests(bool full)
{
//if(full) utRandom_hello_world::test();
- if(full) {
- std::cout << "utRandom_archiving" << std::endl;
- utRandom_archiving::test();
- }
+ if(full) utRandom_archiving::test();
}
} // nRandom
Modified: development/source/tools/cString.cc
===================================================================
--- development/source/tools/cString.cc 2006-07-10 18:51:39 UTC (rev 819)
+++ development/source/tools/cString.cc 2006-07-11 01:40:30 UTC (rev 820)
@@ -664,7 +664,7 @@
*/
#include "cXMLArchive.h"
-#include <boost/detail/lightweight_test.hpp>
+#include "lightweight_test.h"
#include <cstdio> // for std::remove() to remove temporary files.
#include <iomanip>
@@ -714,51 +714,54 @@
namespace utString_hello_world {
void test(){
- BOOST_TEST(true);
- BOOST_TEST(false);
+ std::cout << CURRENT_FUNCTION << std::endl;
+ TEST(true);
+ TEST(false);
}
}
namespace utString_archiving {
- void test(){
+ void test() {
+# ifdef ENABLE_SERIALIZATION
+ std::cout << CURRENT_FUNCTION << std::endl;
{
- BOOST_TEST(true);
+ TEST(true);
std::string filename("./cString_basic_serialization.xml");
- BOOST_TEST(0 == A::s_instance_ct);
+ TEST(0 == A::s_instance_ct);
A *a(new A);
- BOOST_TEST(1 == A::s_instance_ct);
+ TEST(1 == A::s_instance_ct);
/*
Both instances of cString should share a single cStringData instance.
*/
- BOOST_TEST(cString("blah.") == a->m_s1);
- BOOST_TEST(cString("blah.") == a->m_s2);
+ TEST(cString("blah.") == a->m_s1);
+ TEST(cString("blah.") == a->m_s2);
const char *s1(a->m_s1);
const char *s2(a->m_s2);
- BOOST_TEST(s1 == s2);
+ TEST(s1 == s2);
/*
Both pointers should point to one cString instance.
*/
- BOOST_TEST(cString("ick.") == *a->m_ps1);
- BOOST_TEST(cString("ick.") == *a->m_ps2);
+ TEST(cString("ick.") == *a->m_ps1);
+ TEST(cString("ick.") == *a->m_ps2);
const char *s3(*a->m_ps1);
const char *s4(*a->m_ps2);
- BOOST_TEST(s3 == s4);
+ TEST(s3 == s4);
save_stuff<>(a, filename.c_str());
delete a;
- BOOST_TEST(0 == A::s_instance_ct);
+ TEST(0 == A::s_instance_ct);
restore_stuff<>(a, filename.c_str());
- BOOST_TEST(1 == A::s_instance_ct);
+ TEST(1 == A::s_instance_ct);
/*
Both instances of cString should share a single cStringData instance.
*/
- BOOST_TEST(cString("blah.") == a->m_s1);
- BOOST_TEST(cString("blah.") == a->m_s2);
+ TEST(cString("blah.") == a->m_s1);
+ TEST(cString("blah.") == a->m_s2);
/*
We have decided to not track cStringData instance sharing;
consequently we now expect that if two strings sharing data are
@@ -769,29 +772,29 @@
*/
const char *s5(a->m_s1);
const char *s6(a->m_s2);
- BOOST_TEST(s5 != s6);
+ TEST(s5 != s6);
/*
Both pointers should point to one cString instance.
*/
- BOOST_TEST(cString("ick.") == *a->m_ps1);
- BOOST_TEST(cString("ick.") == *a->m_ps2);
+ TEST(cString("ick.") == *a->m_ps1);
+ TEST(cString("ick.") == *a->m_ps2);
const char *s7(*a->m_ps1);
const char *s8(*a->m_ps2);
- BOOST_TEST(s7 == s8);
+ TEST(s7 == s8);
delete a;
- BOOST_TEST(0 == A::s_instance_ct);
+ TEST(0 == A::s_instance_ct);
std::remove(filename.c_str());
}
{
- BOOST_TEST(true);
+ TEST(true);
std::string filename("./cString_basic_serialization_2.xml");
- BOOST_TEST(0 == A::s_instance_ct);
+ TEST(0 == A::s_instance_ct);
A *a(new A);
- BOOST_TEST(1 == A::s_instance_ct);
+ TEST(1 == A::s_instance_ct);
/*
Both instances of cString were sharing a single cStringData
@@ -800,53 +803,54 @@
have its own cStringData.
*/
a->m_s1 = "bleah.";
- BOOST_TEST(cString("bleah.") == a->m_s1);
- BOOST_TEST(cString("blah.") == a->m_s2);
+ TEST(cString("bleah.") == a->m_s1);
+ TEST(cString("blah.") == a->m_s2);
const char *s1(a->m_s1);
const char *s2(a->m_s2);
- BOOST_TEST(s1 != s2);
+ TEST(s1 != s2);
/*
Both pointers should point to one cString instance.
*/
*a->m_ps1 = "ack.";
- BOOST_TEST(cString("ack.") == *a->m_ps1);
- BOOST_TEST(cString("ack.") == *a->m_ps2);
+ TEST(cString("ack.") == *a->m_ps1);
+ TEST(cString("ack.") == *a->m_ps2);
const char *s3(*a->m_ps1);
const char *s4(*a->m_ps2);
- BOOST_TEST(s3 == s4);
+ TEST(s3 == s4);
save_stuff<>(a, filename.c_str());
delete a;
- BOOST_TEST(0 == A::s_instance_ct);
+ TEST(0 == A::s_instance_ct);
restore_stuff<>(a, filename.c_str());
- BOOST_TEST(1 == A::s_instance_ct);
+ TEST(1 == A::s_instance_ct);
/*
Each cString should have its own cStringData.
*/
- BOOST_TEST(cString("bleah.") == a->m_s1);
- BOOST_TEST(cString("blah.") == a->m_s2);
+ TEST(cString("bleah.") == a->m_s1);
+ TEST(cString("blah.") == a->m_s2);
const char *s5(a->m_s1);
const char *s6(a->m_s2);
- BOOST_TEST(s5 != s6);
+ TEST(s5 != s6);
/*
Both pointers should point to one cString instance.
*/
- BOOST_TEST(cString("ack.") == *a->m_ps1);
- BOOST_TEST(cString("ack.") == *a->m_ps2);
+ TEST(cString("ack.") == *a->m_ps1);
+ TEST(cString("ack.") == *a->m_ps2);
const char *s7(*a->m_ps1);
const char *s8(*a->m_ps2);
- BOOST_TEST(s7 == s8);
+ TEST(s7 == s8);
delete a;
- BOOST_TEST(0 == A::s_instance_ct);
+ TEST(0 == A::s_instance_ct);
std::remove(filename.c_str());
}
+# endif // ENABLE_SERIALIZATION
}
} // utString_archiving
@@ -854,14 +858,8 @@
void UnitTests(bool full)
{
- //if(full) {
- // std::cout << "utString_hello_world" << std::endl;
- // utString_hello_world::test();
- //}
- if(full) {
- std::cout << "utString_archiving" << std::endl;
- utString_archiving::test();
- }
+ //if(full) utString_hello_world::test();
+ if(full) utString_archiving::test();
}
} // nString
Modified: development/source/tools/cStringList.cc
===================================================================
--- development/source/tools/cStringList.cc 2006-07-10 18:51:39 UTC (rev 819)
+++ development/source/tools/cStringList.cc 2006-07-11 01:40:30 UTC (rev 820)
@@ -80,7 +80,7 @@
*/
#include "cXMLArchive.h"
-#include <boost/detail/lightweight_test.hpp>
+#include "lightweight_test.h"
#include <cstdio> // for std::remove() to remove temporary files.
#include <iomanip>
@@ -109,13 +109,16 @@
namespace utStringList_hello_world {
void test(){
- BOOST_TEST(true);
- BOOST_TEST(false);
+ std::cout << CURRENT_FUNCTION << std::endl;
+ TEST(true);
+ TEST(false);
}
}
namespace utStringList_archiving {
- void test(){
+ void test() {
+# ifdef ENABLE_SERIALIZATION
+ std::cout << CURRENT_FUNCTION << std::endl;
char numstr[] = "number 0";
cString s;
cStringList sl;
@@ -126,13 +129,13 @@
/*
Construct basic list.
*/
- BOOST_TEST(0 == sl.GetSize());
+ TEST(0 == sl.GetSize());
for(i=0; i<listsize; i++){
numstr[7] = '0' + i;
s = cString(numstr);
sl.PushRear(s);
}
- BOOST_TEST(listsize == sl.GetSize());
+ TEST(listsize == sl.GetSize());
/*
Verify basic list contents.
@@ -141,22 +144,22 @@
for(i=0; !it.AtEnd(); i++){
s = it.Next();
numstr[7] = '0' + i;
- BOOST_TEST(cString(numstr) == s);
+ TEST(cString(numstr) == s);
}
- BOOST_TEST(i == listsize);
+ TEST(i == listsize);
/*
Save basic list.
*/
save_stuff<>(sl, filename.c_str());
sl.Clear();
- BOOST_TEST(0 == sl.GetSize());
+ TEST(0 == sl.GetSize());
/*
Reload basic list.
*/
restore_stuff<>(sl, filename.c_str());
- BOOST_TEST(listsize == sl.GetSize());
+ TEST(listsize == sl.GetSize());
/*
Verify contents of reloaded basic list.
@@ -165,14 +168,15 @@
for(i=0; !it.AtEnd(); i++){
s = it.Next();
numstr[7] = '0' + i;
- BOOST_TEST(cString(numstr) == s);
+ TEST(cString(numstr) == s);
}
- BOOST_TEST(i == listsize);
+ TEST(i == listsize);
sl.Clear();
- BOOST_TEST(0 == sl.GetSize());
+ TEST(0 == sl.GetSize());
std::remove(filename.c_str());
+# endif // ENABLE_SERIALIZATION
}
} // utStringList_archiving
@@ -180,14 +184,8 @@
void UnitTests(bool full)
{
- //if(full) {
- // std::cout << "utStringList_hello_world" << std::endl;
- // utStringList_hello_world::test();
- //}
- if(full) {
- std::cout << "utStringList_archiving" << std::endl;
- utStringList_archiving::test();
- }
+ //if(full) utStringList_hello_world::test();
+ if(full) utStringList_archiving::test();
}
} // nStringList
Added: development/source/tools/lightweight_test.h
===================================================================
--- development/source/tools/lightweight_test.h 2006-07-10 18:51:39 UTC (rev 819)
+++ development/source/tools/lightweight_test.h 2006-07-11 01:40:30 UTC (rev 820)
@@ -0,0 +1,60 @@
+#ifndef lightweight_test_h
+#define lightweight_test_h
+
+#include <iostream>
+
+inline void current_function_helper()
+{
+#if defined(__GNUC__) || (defined(__MWERKS__) && (__MWERKS__ >= 0x3000)) || (defined(__ICC) && (__ICC >= 600))
+# define CURRENT_FUNCTION __PRETTY_FUNCTION__
+#elif defined(__FUNCSIG__)
+# define CURRENT_FUNCTION __FUNCSIG__
+#elif (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 600)) || (defined(__IBMCPP__) && (__IBMCPP__ >= 500))
+# define CURRENT_FUNCTION __FUNCTION__
+#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x550)
+# define CURRENT_FUNCTION __FUNC__
+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901)
+# define CURRENT_FUNCTION __func__
+#else
+# define CURRENT_FUNCTION "(unknown)"
+#endif
+}
+
+inline int & test_errors()
+{
+ static int x = 0;
+ return x;
+}
+
+inline void test_failed_impl(char const * expr, char const * file, int line, char const * function)
+{
+ std::cerr << file << "(" << line << "): test '" << expr << "' failed in function '" << function << "'" << std::endl;
+ ++test_errors();
+}
+
+inline void error_impl(char const * msg, char const * file, int line, char const * function)
+{
+ std::cerr << file << "(" << line << "): " << msg << " in function '" << function << "'" << std::endl;
+ ++test_errors();
+}
+
+inline int report_errors()
+{
+ int errors = test_errors();
+
+ if(errors == 0)
+ {
+ std::cerr << "No errors detected." << std::endl;
+ return 0;
+ }
+ else
+ {
+ std::cerr << errors << " error" << (errors == 1? "": "s") << " detected." << std::endl;
+ return 1;
+ }
+}
+
+#define TEST(expr) ((expr)? (void)0: test_failed_impl(#expr, __FILE__, __LINE__, CURRENT_FUNCTION))
+#define ERROR(msg) error_impl(msg, __FILE__, __LINE__, CURRENT_FUNCTION)
+
+#endif
Modified: development/source/tools/nTemplateTests.cc
===================================================================
--- development/source/tools/nTemplateTests.cc 2006-07-10 18:51:39 UTC (rev 819)
+++ development/source/tools/nTemplateTests.cc 2006-07-11 01:40:30 UTC (rev 820)
@@ -78,6 +78,7 @@
namespace utTemplateTests_hello_world {
void test(){
+ std::cout << "utTemplateTests_hello_world" << std::endl;
BOOST_TEST(true);
BOOST_TEST(false);
}
@@ -85,7 +86,8 @@
namespace utMemTrack {
- void test(){
+ void test() {
+ std::cout << "utMemTrack" << std::endl;
BOOST_TEST(0 == tMemTrack<A>::Instances());
{
A a;
@@ -103,7 +105,9 @@
}
namespace utList_basic_serialization {
- void test(){
+ void test() {
+# ifdef ENABLE_SERIALIZATION
+ std::cout << "utList_basic_serialization" << std::endl;
BOOST_TEST(0 == tMemTrack<A>::Instances());
A *a;
tList<A> l;
@@ -170,11 +174,14 @@
BOOST_TEST(1 == tMemTrack<tListNode<A> >::Instances());
std::remove(filename.c_str());
+# endif // ENABLE_SERIALIZATION
}
} // utList_basic_serialization
namespace utList_archive_structure {
- void test(){
+ void test() {
+# ifdef ENABLE_SERIALIZATION
+ std::cout << "utList_archive_structure" << std::endl;
std::string filename("./tList_archive_structure.xml");
A *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8, *a9, *a10;
@@ -274,11 +281,14 @@
BOOST_TEST(0 == tMemTrack<A>::Instances());
std::remove(filename.c_str());
+# endif // ENABLE_SERIALIZATION
}
} // utList_archive_structure
namespace utArrays_of_pointers {
- void test(){
+ void test() {
+# ifdef ENABLE_SERIALIZATION
+ std::cout << "utArrays_of_pointers" << std::endl;
const int num_instances = 3;
tArray<A *> instance_array(num_instances);
BOOST_TEST(0 == tMemTrack<A>::Instances());
@@ -290,11 +300,14 @@
delete instance_array[i];
}
BOOST_TEST(0 == tMemTrack<A>::Instances());
+# endif // ENABLE_SERIALIZATION
}
} // utArrays_of_pointers
namespace utArray_basic_serialization {
- void test(){
+ void test() {
+# ifdef ENABLE_SERIALIZATION
+ std::cout << "utArray_basic_serialization" << std::endl;
std::string filename("./tArray_basic_serialization.xml");
int i, arraysize = 10;
@@ -340,11 +353,14 @@
BOOST_TEST(0 == tMemTrack<A>::Instances());
std::remove(filename.c_str());
+# endif // ENABLE_SERIALIZATION
}
} // utArray_basic_serialization
namespace utHashTable_basic_serialization {
- void test(){
+ void test() {
+# ifdef ENABLE_SERIALIZATION
+ std::cout << "utHashTable_basic_serialization" << std::endl;
std::string filename("./tHashTable_basic_serialization.xml");
BOOST_TEST(0 == tMemTrack<A>::Instances());
@@ -414,11 +430,14 @@
BOOST_TEST(dictsize == tMemTrack<A>::Instances());
std::remove(filename.c_str());
+# endif // ENABLE_SERIALIZATION
}
} // utHashTable_basic_serialization
namespace utDictionary_basic_serialization {
- void test(){
+ void test() {
+# ifdef ENABLE_SERIALIZATION
+ std::cout << "utDictionary_basic_serialization" << std::endl;
std::string filename("./tDictionary_basic_serialization.xml");
BOOST_TEST(0 == tMemTrack<A>::Instances());
@@ -489,11 +508,14 @@
BOOST_TEST(dictsize == tMemTrack<A>::Instances());
std::remove(filename.c_str());
+# endif // ENABLE_SERIALIZATION
}
} // utDictionary_basic_serialization
namespace utBuffer_basic_serialization {
- void test(){
+ void test() {
+# ifdef ENABLE_SERIALIZATION
+ std::cout << "utBuffer_basic_serialization" << std::endl;
std::string filename("./tBuffer_basic_serialization.xml");
A a;
int i, buffer_size = 10;
@@ -557,11 +579,14 @@
BOOST_TEST(b.GetNum() == buffer_size - 1);
std::remove(filename.c_str());
+# endif // ENABLE_SERIALIZATION
}
} // utBuffer_basic_serialization
namespace utManagedPointerArray_basic_serialization {
- void test(){
+ void test() {
+# ifdef ENABLE_SERIALIZATION
+ std::cout << "utManagedPointerArray_basic_serialization" << std::endl;
std::string filename("./tManagedPointerArray_basic_serialization.xml");
int i, arraysize = 10;
@@ -607,11 +632,14 @@
BOOST_TEST(0 == tMemTrack<A>::Instances());
std::remove(filename.c_str());
+# endif // ENABLE_SERIALIZATION
}
} // utManagedPointerArray_basic_serialization
namespace utSmartArray_basic_serialization {
- void test(){
+ void test() {
+# ifdef ENABLE_SERIALIZATION
+ std::cout << "utSmartArray_basic_serialization" << std::endl;
std::string filename("./tSmartArray_basic_serialization.xml");
int i, arraysize = 10;
@@ -657,11 +685,14 @@
BOOST_TEST(0 == tMemTrack<A>::Instances());
std::remove(filename.c_str());
+# endif // ENABLE_SERIALIZATION
}
} // utSmartArray_basic_serialization
namespace utMatrix_basic_serialization {
- void test(){
+ void test() {
+# ifdef ENABLE_SERIALIZATION
+ std::cout << "utMatrix_basic_serialization" << std::endl;
std::string filename("./tMatrix_basic_serialization.xml");
int i, j, rows = 3, cols = 5;
@@ -716,6 +747,7 @@
BOOST_TEST(1 == tMemTrack<A>::Instances());
std::remove(filename.c_str());
+# endif // ENABLE_SERIALIZATION
}
} // utMatrix_basic_serialization
@@ -724,53 +756,17 @@
void UnitTests(bool full)
{
- //if(full) {
- // std::cout << "utTemplateTests_hello_world" << std::endl;
- // utTemplateTests_hello_world::test();
- //}
- if(full) {
- std::cout << "utMemTrack" << std::endl;
- utMemTrack::test();
- }
- if(full) {
- std::cout << "utList_basic_serialization" << std::endl;
- utList_basic_serialization::test();
- }
- if(full) {
- std::cout << "utList_archive_structure" << std::endl;
- utList_archive_structure::test();
- }
- if(full) {
- std::cout << "utArrays_of_pointers" << std::endl;
- utArrays_of_pointers::test();
- }
- if(full) {
- std::cout << "utArray_basic_serialization" << std::endl;
- utArray_basic_serialization::test();
- }
- if(full) {
- std::cout << "utHashTable_basic_serialization" << std::endl;
- utHashTable_basic_serialization::test();
- }
- if(full) {
- std::cout << "utDictionary_basic_serialization" << std::endl;
- utDictionary_basic_serialization::test();
- }
- if(full) {
- std::cout << "utBuffer_basic_serialization" << std::endl;
- utBuffer_basic_serialization::test();
- }
- if(full) {
- std::cout << "utManagedPointerArray_basic_serialization" << std::endl;
- utManagedPointerArray_basic_serialization::test();
- }
- if(full) {
- std::cout << "utSmartArray_basic_serialization" << std::endl;
- utSmartArray_basic_serialization::test();
- }
- if(full) {
- std::cout << "utMatrix_basic_serialization" << std::endl;
- utMatrix_basic_serialization::test();
- }
+ //if(full) utTemplateTests_hello_world::test();
+ if(full) utMemTrack::test();
+ if(full) utList_basic_serialization::test();
+ if(full) utList_archive_structure::test();
+ if(full) utArrays_of_pointers::test();
+ if(full) utArray_basic_serialization::test();
+ if(full) utHashTable_basic_serialization::test();
+ if(full) utDictionary_basic_serialization::test();
+ if(full) utBuffer_basic_serialization::test();
+ if(full) utManagedPointerArray_basic_serialization::test();
+ if(full) utSmartArray_basic_serialization::test();
+ if(full) utMatrix_basic_serialization::test();
}
} // nTemplateTests
Modified: development/support/utils/AvidaUtils/CmdLineOpts.py
===================================================================
--- development/support/utils/AvidaUtils/CmdLineOpts.py 2006-07-10 18:51:39 UTC (rev 819)
+++ development/support/utils/AvidaUtils/CmdLineOpts.py 2006-07-11 01:40:30 UTC (rev 820)
@@ -51,6 +51,12 @@
) )
opts.Add(
SCons.Options.BoolOption(
+ 'enableSerialization',
+ """Set to "1" to build and run test code.""",
+ '$plat_default_enableSerialization',
+ ) )
+ opts.Add(
+ SCons.Options.BoolOption(
'enableTestCode',
"""Set to "1" to build and run test code.""",
0
Modified: development/support/utils/AvidaUtils/PlatformTool.py
===================================================================
--- development/support/utils/AvidaUtils/PlatformTool.py 2006-07-10 18:51:39 UTC (rev 819)
+++ development/support/utils/AvidaUtils/PlatformTool.py 2006-07-11 01:40:30 UTC (rev 820)
@@ -47,6 +47,7 @@
env.SetDefault(
COMPILER_WARNING_FLAGS = "-Wall -Wno-long-double -Wno-long-long",
+ plat_default_enableSerialization = 0,
plat_default_enableTestCode = 0,
plat_default_enablePyPkg = 0,
plat_default_enableSharedPtr = 0,
@@ -347,6 +348,7 @@
env.Append(CPPPATH = ['#/source/platform/win32-pthread'])
env.SetDefault(
+ plat_default_enableSerialization = 0,
plat_default_enableTestCode = 0,
plat_default_enablePyPkg = 0,
plat_default_enableSharedPtr = 0,
More information about the Avida-cvs
mailing list