Index: openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl	19 Dec 2002 16:15:19 -0000	1.10
+++ openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl	22 Jan 2003 15:30:12 -0000	1.11
@@ -287,6 +287,7 @@
 }
 
 ad_proc apm_bootstrap_load_libraries {
+    {-load_tests:boolean 0}
     {-init:boolean}
     {-procs:boolean}
     package_key
@@ -329,8 +330,14 @@
             ([string equal $file_type tcl_procs] && $procs_p ||
              [string equal $file_type tcl_init] && $init_p)} {
 
-		    apm_bootstrap_load_file $root_directory $file
+                 # Don't source acs-automated-testing tests before that package has been
+                 # loaded
+                 if { ! $load_tests_p && [regexp {tcl/test/[^/]+$} $file match] } {
+                     continue
+                 } 
 
+		 apm_bootstrap_load_file $root_directory $file
+
             # Call db_release_unused_handles, only if the library defining it
             # (10-database-procs.tcl) has been sourced yet.
             if { [llength [info procs db_release_unused_handles]] != 0 } {