[Avida-SVN] r1308 - in extras: . source/testsuites

[kaben at myxo.css.msu.edu]

Author: kaben
Date: 2007-02-13 09:05:00 -0500 (Tue, 13 Feb 2007)
New Revision: 1308

Modified:
   extras/
   extras/source/testsuites/nAnalyze.cpp
Log:
 r1380 at stochastic:  kaben | 2007-02-12 20:36:56 -0500
 Disabled obsolete test "cAnalyze_UnitTest_Destructor".



Property changes on: extras
___________________________________________________________________
Name: svk:merge
   - 079b078a-dbed-46b9-b3da-37668d4295ca:/avida/local/extras:1379
   + 079b078a-dbed-46b9-b3da-37668d4295ca:/avida/local/extras:1380

Modified: extras/source/testsuites/nAnalyze.cpp
===================================================================
--- extras/source/testsuites/nAnalyze.cpp	2007-02-13 14:04:58 UTC (rev 1307)
+++ extras/source/testsuites/nAnalyze.cpp	2007-02-13 14:05:00 UTC (rev 1308)
@@ -939,11 +939,11 @@
 
       args.PushRear("-set");
       args.PushRear("WORLD_X");
-      args.PushRear("20");
+      args.PushRear("100");
 
       args.PushRear("-set");
       args.PushRear("WORLD_Y");
-      args.PushRear("20");
+      args.PushRear("100");
 
       args.PushRear("-set");
       args.PushRear("EVENT_FILE");
@@ -1009,7 +1009,7 @@
         //a.Send("DETAIL archive_0/detail.dat id parent_id num_cpus fitness viable length sequence");
 
         /* 'num_gens' synchronous generations. {{{4 */
-        int num_gens = 100;
+        int num_gens = 10;
         for(int g=0; g<num_gens; g++){
           /* Mock-up of arguments to COMPETE command. {{{5 */
           int world_x = world->GetConfig().WORLD_X.Get();
@@ -1179,46 +1179,6 @@
     cAddTestSuite t("cAnalyze_UnitTest_cAvidaConfigDestruction", test);
   }
 
-  /* cAnalyze_UnitTest_Destructor {{{2 */
-  namespace UnitTest_Destructor {
-    void test(){
-      cout << "FIXME : interim test. I'm trying to track-down" << endl;
-      cout << "bad destruction of cWorld. When I figure out" << endl;
-      cout << "what's wrong, move this test to reflect the" << endl;
-      cout << "source of the bug. @kgn" << endl;
-      cout << "XXX This is a test stub. It needs filling-in. @kgn" << endl;
-
-      char * argv[] = {
-        "cAnalyze_UnitTest_Destructor",
-        "-c", "gcs_avida.cfg",
-      };
-      int argc = sizeof(argv)/sizeof(char *);
-
-      cout << "argc : " << argc << endl;
-
-      cDriverManager::Initialize();
-      cWorld *world = new cWorld(
-        cAvidaConfig::LoadWithCmdLineArgs(argc, argv)
-      );
-      cAvidaDriver* driver = NULL;
-
-      if (world->GetConfig().ANALYZE_MODE.Get() > 0) {
-        driver = new cDefaultAnalyzeDriver(world, (world->GetConfig().ANALYZE_MODE.Get() == 2));
-      } else {
-        driver = new cDefaultRunDriver(world);
-      }
-  
-      driver->Run();
-
-      /*
-      FIXME : driver currently deletes world.
-      */
-      delete driver;
-      //delete world;
-    }
-    cAddTestSuite t("cAnalyze_UnitTest_Destructor", test);
-  }
-
   /* cAnalyze_UnitTest_Archiving {{{2 */
   namespace UnitTest_Archiving {
     void test(cTestSettings &settings){