From 81eab5e801a1ced6cfd4db64eb4542c145f1e924 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Mon, 24 Feb 2003 21:58:23 +0000
Subject: [PATCH] various fixes

svn path=/trunk/boinc/; revision=960
---
 test/make_project_ap.php  | 5 +++--
 test/make_project_sah.php | 5 +++--
 test/test.inc             | 8 ++------
 test/test_loop.php        | 6 ++++++
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/test/make_project_ap.php b/test/make_project_ap.php
index 2e101e93c4..ac80fcae5e 100644
--- a/test/make_project_ap.php
+++ b/test/make_project_ap.php
@@ -16,12 +16,14 @@
     $app_version = new App_Version($app);
     $app_version->platform = $platform;
     $app_version->exec_dir = "../apps";
+    $app_version->version = 5;
     $app_version->exec_name = "ap_win_0.05.exe";
 
     $core_app = new App("core client");
     $core_app_version = new App_Version($core_app);
     $core_app_version->platform = $platform;
     $core_app_version->exec_dir = "../apps";
+    $core_app_version->version = 13;
     $core_app_version->exec_name = "BOINC_0.13a.exe";
 
     $project->add_app($app);
@@ -49,6 +51,5 @@
     array_push($work->input_files, "03au00ab_20575_00000.wu");
     $work->install($project);
 
-    $project->start_feeder();
-    $project->start_make_work($work);
+    $project->start_servers();
 ?>
diff --git a/test/make_project_sah.php b/test/make_project_sah.php
index f73ff2e04d..e54a233841 100644
--- a/test/make_project_sah.php
+++ b/test/make_project_sah.php
@@ -16,12 +16,14 @@
     $app_version = new App_Version($app);
     $app_version->platform = $platform;
     $app_version->exec_dir = "../apps";
+    $app_version->version = 5;
     $app_version->exec_name = "ap_win_0.05.exe";
 
     $core_app = new App("core client");
     $core_app_version = new App_Version($core_app);
     $core_app_version->platform = $platform;
     $core_app_version->exec_dir = "../apps";
+    $core_app_version->version = 13;
     $core_app_version->exec_name = "BOINC_0.13a.exe";
 
     $project->add_app($app);
@@ -48,6 +50,5 @@
     array_push($work->input_files, "03au00ab_20575_00000.wu");
     $work->install($project);
 
-    $project->start_feeder();
-    $project->start_make_work($work);
+    $project->start_servers();
 ?>
diff --git a/test/test.inc b/test/test.inc
index c14eedc15d..7cd12bd5e9 100644
--- a/test/test.inc
+++ b/test/test.inc
@@ -467,18 +467,14 @@ class Project {
         PassThru("cp $this->source_dir/sched/file_upload_handler $this->project_dir/cgi/file_upload_handler$handler_num");
     }
 
-    function start_server(){
-        PassThru("cd $this->project_dir/cgi; ./start_server >> start_server_out 2>&1");
+    function start_servers(){
+        PassThru("cd $this->project_dir/cgi; ./start_servers >> start_servers_out 2>&1");
     }
 
     function start_feeder(){
         PassThru("cd $this->project_dir/cgi; ./feeder -asynch >> feeder_out 2>&1");
     }
 
-    function result_retry($app, $nerror = 5, $ndet = 5, $nredundancy = 5){
-        PassThru("cd $this->project_dir/cgi; ./result_retry -app $app->name -nerror $nerror -ndet $ndet -nredundancy $nredundancy  >> result_retry_out 2>&1");
-    }
-
     function start_result_retry($app, $nerror = 5,$ndet = 5, $nredundancy = 5){
         PassThru("cd $this->project_dir/cgi; ./result_retry -app $app->name -nerror $nerror -ndet $ndet -nredundancy $nredundancy -asynch >> result_retry_out 2>&1");
     }
diff --git a/test/test_loop.php b/test/test_loop.php
index 03f0d8ad33..642cac99e6 100644
--- a/test/test_loop.php
+++ b/test/test_loop.php
@@ -14,6 +14,11 @@
     $project->add_user($user);
     $project->add_app($app);
     $project->add_app_version($app_version);
+    $project->start_feeder = true;
+    $project->start_make_work = true;
+    $project->start_validate = true;
+    $project->start_file_delete = true;
+    $project->start_assimilator = true;
     $project->install();      // must install projects before adding to hosts
 
     $host->log_flags = "log_flags.xml";
@@ -36,6 +41,7 @@
     $project->start_file_delete();
     $project->start_assimilator($app);
     $project->start_stripchart();
+    //$project->start_servers();
     $host->run();
     $project->stop();
 ?>