Index: openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl	10 Sep 2002 22:22:05 -0000	1.12
+++ openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl	15 Nov 2002 13:07:50 -0000	1.13
@@ -130,14 +130,45 @@
 	nsv_set apm_enabled_package $package_key 1
     }
 
+    #
+    # Check for the presence of the automated testing package.
+    #
+    set load_tests_p 0
+    foreach enabled_p [db_list automated_test_enabled_select {
+      select attr_value as enabled_p
+      from apm_parameter_values, apm_parameters
+      where apm_parameter_values.parameter_id = apm_parameters.parameter_id and
+            apm_parameters.parameter_name = 'enabled_p' and
+            apm_parameter_values.package_id in
+        (select package_id from apm_packages, site_nodes
+         where package_key = 'acs-automated-testing' and
+               apm_packages.package_id = site_nodes.object_id);
+    }] {
+	    if {$enabled_p} {
+        set load_tests_p 1
+      }
+    }
+
+
     # Load *-procs.tcl and *-init.tcl files for enabled packages.
     apm_load_libraries -procs
 
     # Load up the Queries (OpenACS, ben@mit.edu)
     apm_load_queries
 
+    # Load up the Automated Tests and associated Queries if necessary
+    if {$load_tests_p} {
+      apm_load_libraries -test_procs
+      apm_load_queries -test_queries
+    }
+
     apm_load_libraries -init
 
+    # Load up the Automated Tests initialisation scripts is necessary
+    if {$load_tests_p} {
+      apm_load_libraries -test_init
+    }
+
     if { ![nsv_exists rp_properties request_count] } {
 	# security-init.tcl has not been invoked, so it's safe to say that the
 	# core has not been properly initialized and the server will probably