From edb165438a6ae4bd2788a8c2e5c7d233e4fe14fb Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Mon, 12 Aug 2002 00:38:31 +0000
Subject: [PATCH] little stuff

svn path=/trunk/boinc/; revision=289
---
 checkin_notes         | 2 +-
 sched/server_types.C  | 2 +-
 test/laptop_prefs.xml | 7 +++----
 test/test_prefs.php   | 1 +
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 157b85d11a..bdd3e56fe4 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -1386,7 +1386,7 @@ Eric Heien  August 2, 2002
         net_xfer.C
         net_xfer.h
 
-David A.
+David A.    August 4 2002
     Various changes to API:
         - Added user, team names, credit info to APP_INIT_DATA
         - separate call for getting init data
diff --git a/sched/server_types.C b/sched/server_types.C
index 69d53feb82..6b82fbba0d 100644
--- a/sched/server_types.C
+++ b/sched/server_types.C
@@ -229,7 +229,7 @@ int RESULT::parse_from_client(FILE* fin) {
         if (match_tag(buf, "</result>")) return 0;
         else if (parse_str(buf, "<name>", name)) continue;
         else if (parse_int(buf, "<exit_status>", exit_status)) continue;
-        else if (parse_double(buf, "<cpu_time>", cpu_time)) continue;
+        else if (parse_double(buf, "<final_cpu_time>", cpu_time)) continue;
         else if (match_tag(buf, "<file_info>")) {
             strcat(xml_doc_out, buf);
             while (fgets(buf, 256, fin)) {
diff --git a/test/laptop_prefs.xml b/test/laptop_prefs.xml
index 07ab1144fd..2869d7be65 100644
--- a/test/laptop_prefs.xml
+++ b/test/laptop_prefs.xml
@@ -6,12 +6,11 @@
     <disk_max_used_pct>50</disk_max_used_pct>
     <disk_min_free_gb>0.4</disk_min_free_gb>
     <project>
-        <master_url>http://localhost.localdomain</master_url>
-        <email_addr>david@localdomain</email_addr>
-        <authenticator>123892398</authenticator>
+        <master_url>BOINC_MASTER_URL</master_url>
+        <authenticator>3f7b90793a0175ad0bda68684e8bd136</authenticator>
         <resource_share>10</resource_share>
         <project_specific>
             <color-scheme>Tahiti Sunset</color-scheme>
         </project_specific>
-    </project>\n"
+    </project>
 </preferences>
diff --git a/test/test_prefs.php b/test/test_prefs.php
index 4a81409264..a7adaf85d4 100644
--- a/test/test_prefs.php
+++ b/test/test_prefs.php
@@ -17,6 +17,7 @@
     add_app("uc_slow", null, null);
     create_work("-appname uc_slow -wu_name ucs_wu -wu_template ucs_wu -result_template ucs_result -nresults 1 small_input");
     echo "Now run the client manually; start and stop it a few times.\n";
+    start_feeder();
     //run_client();
     //compare_file("ucs_wu_0_0", "uc_small_correct_output");
 ?>