Commit ae8eb62f authored by hrchilds's avatar hrchilds
Browse files

Update from March 21, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@436 18c085ea-50e0-402c-830e-de6fd14e8384
parent 7163d8d8
...@@ -105,6 +105,9 @@ ...@@ -105,6 +105,9 @@
# Hank Childs, Sat Mar 5 12:33:28 PST 2005 # Hank Childs, Sat Mar 5 12:33:28 PST 2005
# Add skips for dynamic load balancing mode. Run the DLB mode every Sunday. # Add skips for dynamic load balancing mode. Run the DLB mode every Sunday.
# #
# Mark C. Miller Mon Mar 21 18:57:08 PST 2005
# Added skips for purify mode
#
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# list of users who want email every night with the log file # list of users who want email every night with the log file
...@@ -188,6 +191,7 @@ LD_LIBRARY_PATH=/usr/local/lib ...@@ -188,6 +191,7 @@ LD_LIBRARY_PATH=/usr/local/lib
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
env CXXFLAGS="-g" ./configure --enable-parallel 1>> buildlog 2>&1 env CXXFLAGS="-g" ./configure --enable-parallel 1>> buildlog 2>&1
rm -f plugins/*/*.so rm -f plugins/*/*.so
(cd data; clearmake clean)
clearmake -J 2 1>> buildlog 2>&1 clearmake -J 2 1>> buildlog 2>&1
error=$? error=$?
...@@ -237,7 +241,9 @@ fi ...@@ -237,7 +241,9 @@ fi
# set list of tests/modes to skip # set list of tests/modes to skip
#skipList="dummy_mode:tests/dummy_category/dummy_file.py" #skipList="dummy_mode:tests/dummy_category/dummy_file.py"
skipList="dlb:tests/databases/global_node_ids.py \ skipList="dlb:tests/databases/global_node_ids.py \
dlb:tests/queries/pick.py" dlb:tests/queries/pick.py \
serial,purify:tests/databases/global_node_ids.py \
serial,purify:tests/queries/pick.py"
# run the test(s) # run the test(s)
error=0 error=0
......
...@@ -109,6 +109,10 @@ avtExtents::Print(ostream &out) ...@@ -109,6 +109,10 @@ avtExtents::Print(ostream &out)
// Programmer: Hank Childs // Programmer: Hank Childs
// Creation: September 4, 2001 // Creation: September 4, 2001
// //
// Modifications:
// Mark C. Miller, Mon Mar 21 11:16:10 PST 2005
// Added missing line to set deleted extents to NULL. Other code in this
// class depends on it being null whenever it is NOT allocated.
// **************************************************************************** // ****************************************************************************
const avtExtents & const avtExtents &
...@@ -117,6 +121,7 @@ avtExtents::operator=(const avtExtents &exts) ...@@ -117,6 +121,7 @@ avtExtents::operator=(const avtExtents &exts)
if (extents != NULL) if (extents != NULL)
{ {
delete [] extents; delete [] extents;
extents = NULL;
} }
dimension = exts.dimension; dimension = exts.dimension;
......
...@@ -834,12 +834,13 @@ Engine::AlarmHandler(int signal) ...@@ -834,12 +834,13 @@ Engine::AlarmHandler(int signal)
{ {
debug1 << "ENGINE exited due to an inactivity timeout of " debug1 << "ENGINE exited due to an inactivity timeout of "
<< Engine::Instance()->timeout << " minutes." << endl; << Engine::Instance()->timeout << " minutes." << endl;
Init::Finalize();
#ifdef PARALLEL #ifdef PARALLEL
PAR_Exit(); PAR_Exit();
#else
exit(0);
#endif #endif
Init::Finalize(); exit(0);
} }
// **************************************************************************** // ****************************************************************************
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment