Index: openacs-4/packages/acs-tcl/tcl/test/file-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/file-test-procs.tcl,v
diff -u -N -r1.9.4.1 -r1.9.4.2
--- openacs-4/packages/acs-tcl/tcl/test/file-test-procs.tcl	12 Oct 2013 13:55:19 -0000	1.9.4.1
+++ openacs-4/packages/acs-tcl/tcl/test/file-test-procs.tcl	16 Oct 2013 19:49:10 -0000	1.9.4.2
@@ -18,8 +18,8 @@
         return [expr {[string match {*.tcl} $file] || [file isdirectory $file]}]
     }
 
-    # if startdir is not [acs_root_dir]/packages, then somebody checked in the wrong thing by accident
-    set startdir [acs_root_dir]/packages
+    # if startdir is not $::acs::rootdir/packages, then somebody checked in the wrong thing by accident
+    set startdir $::acs::rootdir/packages
 
     aa_log "Checks starting from $startdir"
 
@@ -51,8 +51,8 @@
         return [expr {[string match {*.tcl} $file] || [file isdirectory $file]}]
     }
 
-    # if startdir is not [acs_root_dir]/packages, then somebody checked in the wrong thing by accident
-    set startdir [acs_root_dir]/packages
+    # if startdir is not $::acs::rootdir/packages, then somebody checked in the wrong thing by accident
+    set startdir $::acs::rootdir/packages
 
     aa_log "Checks starting from $startdir"
     set count 0
@@ -80,7 +80,7 @@
 
     @author Jeff Davis davis@xarg.net
 } {
-    foreach spec_file [glob -nocomplain "[acs_root_dir]/packages/*/*.info"] {
+    foreach spec_file [glob -nocomplain "$::acs::rootdir/packages/*/*.info"] {
         set errp 0
         if {  [catch {array set version [apm_read_package_info_file $spec_file]} errMsg] } {
             aa_log_result fail "$spec_file returned $errMsg"
@@ -129,7 +129,7 @@
 
     @author Jeff Davis davis@xarg.net
 } {
-    foreach dir [lsort [glob -nocomplain -types f "[acs_root_dir]/packages/*/*.info"]] {
+    foreach dir [lsort [glob -nocomplain -types f "$::acs::rootdir/packages/*/*.info"]] {
 
         set error_p 0
 
@@ -201,8 +201,8 @@
         return [expr {[string match {*.xql} $file] || [file isdirectory $file]}]
     }
     
-    # if startdir is not [acs_root_dir]/packages, then somebody checked in the wrong thing by accident
-    set startdir [acs_root_dir]/packages
+    # if startdir is not $::acs::rootdir/packages, then somebody checked in the wrong thing by accident
+    set startdir $::acs::rootdir/packages
     
     aa_log "Checks starting from $startdir"