* tests/pkg1/direct1.tcl: removed

        * tests/pkg1/pkgIndex.tcl: removed
        * tests/pkgMkIndex.test:  Imported auxilliary files from tests/pkg1
        into the test file pkgMkIndex.test itself.  Formatting fixes.

        * unix/Makefile.in: removed tests/pkg/* from `make dist`

3 files changed, 61 insertions, 223 deletions

diff --git a/tests/pkg1/direct1.tcl b/tests/pkg1/direct1.tcl
deleted file mode 100644
index cc10330..0000000
--- a/tests/pkg1/direct1.tcl
+++ /dev/null
@@ -1,23 +0,0 @@
-# std.tcl --
-#
-#  Test support package for pkg_mkIndex.
-#  This is referenced by pkgIndex.tcl as a -direct script.
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: direct1.tcl,v 1.1 1998/10/17 00:21:44 escoffon Exp $
-
-package provide direct1 1.0
-
-namespace eval direct1 {
-    namespace export pd1 pd2
-}
-
-proc direct1::pd1 { stg } {
-    return [string tolower $stg]
-}
-
-proc direct1::pd2 { stg } {
-    return [string toupper $stg]
-}
diff --git a/tests/pkg1/pkgIndex.tcl b/tests/pkg1/pkgIndex.tcl
deleted file mode 100644
index 5dc1d5e..0000000
--- a/tests/pkg1/pkgIndex.tcl
+++ /dev/null
@@ -1,11 +0,0 @@
-# Tcl package index file, version 1.1
-# This file is generated by the "pkg_mkIndex -direct" command
-# and sourced either when an application starts up or
-# by a "package unknown" script.  It invokes the
-# "package ifneeded" command to set up package-related
-# information so that packages will be loaded automatically
-# in response to "package require" commands.  When this
-# script is sourced, the variable $dir must contain the
-# full path name of this file's directory.
-
-package ifneeded direct1 1.0 [list source [file join $dir direct1.tcl]]
diff --git a/tests/pkgMkIndex.test b/tests/pkgMkIndex.test
index 8ca9796..bf3ae18 100644
--- a/tests/pkgMkIndex.test
+++ b/tests/pkgMkIndex.test
@@ -8,7 +8,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: pkgMkIndex.test,v 1.21 2002/07/04 00:32:54 dgp Exp $
+# RCS: @(#) $Id: pkgMkIndex.test,v 1.22 2002/07/04 01:20:37 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -17,11 +17,6 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
 
 set fullPkgPath [makeDirectory pkg]
 
-# Add the pkg1 directory to auto_path, so that its packages can be found.
-# packages in pkg1 are used to test indexing of packages in pkg.
-# Make sure that the path to pkg1 is absolute.
-
-lappend auto_path [file join $::tcltest::testsDirectory pkg1]
 
 namespace eval pkgtest {
     # Namespace for procs we can discard
@@ -265,30 +260,19 @@ test pkgMkIndex-1.1 {nothing matches pattern - current dir is the same} {
 } [list {1 {no files matched glob pattern "nomatch.tcl"}} [pwd]]
 
 makeFile {
-# simple.tcl --
-#
-#  Test package for pkg_mkIndex. This is a simple package, just to check
-#  basic functionality.
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: pkgMkIndex.test,v 1.21 2002/07/04 00:32:54 dgp Exp $
-
+#  This is a simple package, just to check basic functionality.
 package provide simple 1.0
-
 namespace eval simple {
     namespace export lower upper
 }
-
 proc simple::lower { stg } {
     return [string tolower $stg]
 }
-
 proc simple::upper { stg } {
     return [string toupper $stg]
 }
 } [file join pkg simple.tcl]
+
 test pkgMkIndex-2.1 {simple package} {
     pkgtest::runIndex -lazy $fullPkgPath simple.tcl
 } {0 {{simple:1.0 {tclPkgSetup {simple.tcl source {::simple::lower ::simple::upper}}}}}}
@@ -300,25 +284,15 @@ test pkgMkIndex-2.2 {simple package - use -direct} {
 test pkgMkIndex-2.3 {simple package - direct loading is default} {
     pkgtest::runIndex $fullPkgPath simple.tcl
 } "0 {{simple:1.0 {[list source [file join $fullPkgPath simple.tcl]]}}}"
+
 removeFile [file join pkg simple.tcl]
 
 makeFile {
-# global.tcl --
-#
-#  Test package for pkg_mkIndex.
 #  Contains global symbols, used to check that they don't have a leading ::
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: pkgMkIndex.test,v 1.21 2002/07/04 00:32:54 dgp Exp $
-
 package provide global 1.0
-
 proc global_lower { stg } {
     return [string tolower $stg]
 }
-
 proc global_upper { stg } {
     return [string toupper $stg]
 }
@@ -327,56 +301,35 @@ proc global_upper { stg } {
 test pkgMkIndex-3.1 {simple package with global symbols} {
     pkgtest::runIndex -lazy $fullPkgPath global.tcl
 } {0 {{global:1.0 {tclPkgSetup {global.tcl source {global_lower global_upper}}}}}}
+
 removeFile [file join pkg global.tcl]
 
 makeFile {
-# pkg2_a.tcl --
-#
-#  Test package for pkg_mkIndex. This package is required by pkg1.
+#  This package is required by pkg1.
 #  This package is split into two files, to test packages that are split
 #  over multiple files.
-#
-# Copyright (c) 2998 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# SCCS: %Z% %M% %I% %E% %U%
-
 package provide pkg2 1.0
-
 namespace eval pkg2 {
     namespace export p2-1
 }
-
 proc pkg2::p2-1 { num } {
     return [expr $num * 2]
 }
 } [file join pkg pkg2_a.tcl]
+
 makeFile {
-# pkg2_b.tcl --
-#
-#  Test package for pkg_mkIndex. This package is required by pkg1.
+#  This package is required by pkg1.
 #  This package is split into two files, to test packages that are split
 #  over multiple files.
-#
-# Copyright (c) 2998 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# SCCS: %Z% %M% %I% %E% %U%
-
 package provide pkg2 1.0
-
 namespace eval pkg2 {
     namespace export p2-2
 }
-
 proc pkg2::p2-2 { num } {
     return [expr $num * 3]
 }
 } [file join pkg pkg2_b.tcl]
+
 test pkgMkIndex-4.1 {split package} {
     pkgtest::runIndex -lazy $fullPkgPath pkg2_a.tcl pkg2_b.tcl
 } {0 {{pkg2:1.0 {tclPkgSetup {pkg2_a.tcl source ::pkg2::p2-1} {pkg2_b.tcl source ::pkg2::p2-2}}}}}
@@ -386,99 +339,81 @@ test pkgMkIndex-4.2 {split package - direct loading} {
 } "0 {{pkg2:1.0 {[list source [file join $fullPkgPath pkg2_a.tcl]]
 [list source [file join $fullPkgPath pkg2_b.tcl]]}}}"
 
-# This will fail, with "direct1" procedures in the list of procedures
-# provided by std.
-# It may also fail, if tclblend is in the auto_path, with an additional
-# command "loadJava" which comes from the tclblend pkgIndex.tcl file.
-# Both failures are caused by Tcl code executed in pkgIndex.tcl.
-
+# Add the direct1 directory to auto_path, so that the direct1 package 
+# can be found.
+set direct1 [makeDirectory direct1]
+lappend auto_path $direct1
 makeFile {
-# std.tcl --
-#
-#  Test package for pkg_mkIndex.
-#  Does a package require of direct1, whose pkgIndex.tcl entry (in pkg1)
-#  should be a -direct entry.
-#  This tests that pkg_mkIndex can handle code that is sourced in pkgIndex.tcl
-#  files.
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: pkgMkIndex.test,v 1.21 2002/07/04 00:32:54 dgp Exp $
+#  This is referenced by pkgIndex.tcl as a -direct script.
+package provide direct1 1.0
+namespace eval direct1 {
+    namespace export pd1 pd2
+}
+proc direct1::pd1 { stg } {
+    return [string tolower $stg]
+}
+proc direct1::pd2 { stg } {
+    return [string toupper $stg]
+}
+} [file join direct1 direct1.tcl]
+pkg_mkIndex -direct $direct1 direct1.tcl
 
+makeFile {
+#  Does a package require of direct1, whose pkgIndex.tcl entry
+#  is created above with option -direct.  This tests that pkg_mkIndex
+#  can handle code that is sourced in pkgIndex.tcl files.
 package require direct1
-
 package provide std 1.0
-
 namespace eval std {
     namespace export p1 p2
 }
-
 proc std::p1 { stg } {
     return [string tolower $stg]
 }
-
 proc std::p2 { stg } {
     return [string toupper $stg]
 }
 } [file join pkg std.tcl]
+
 test pkgMkIndex-5.1 {requires -direct package} {
     pkgtest::runIndex -lazy $fullPkgPath std.tcl
 } {0 {{std:1.0 {tclPkgSetup {std.tcl source {::std::p1 ::std::p2}}}}}}
+
+removeFile [file join direct1 direct1.tcl]
+file delete [file join $direct1 pkgIndex.tcl]
+removeDirectory direct1
 removeFile [file join pkg std.tcl]
 
 makeFile {
-# pkg1.tcl --
-#
-#  Test package for pkg_mkIndex. This package requires pkg3, but it does
+#  This package requires pkg3, but it does
 #  not use any of pkg3's procs in the code that is executed by the file
 #  (i.e. references to pkg3's procs are in the proc bodies only).
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: pkgMkIndex.test,v 1.21 2002/07/04 00:32:54 dgp Exp $
-
 package require pkg3 1.0
-
 package provide pkg1 1.0
-
 namespace eval pkg1 {
     namespace export p1-1 p1-2
 }
-
 proc pkg1::p1-1 { num } {
     return [pkg3::p3-1 $num]
 }
-
 proc pkg1::p1-2 { num } {
     return [pkg3::p3-2 $num]
 }
 } [file join pkg pkg1.tcl]
-makeFile {
-# pkg3.tcl --
-#
-#  Test package for pkg_mkIndex.
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: pkgMkIndex.test,v 1.21 2002/07/04 00:32:54 dgp Exp $
 
+makeFile {
 package provide pkg3 1.0
-
 namespace eval pkg3 {
     namespace export p3-1 p3-2
 }
-
 proc pkg3::p3-1 { num } {
     return {[expr $num * 2]}
 }
-
 proc pkg3::p3-2 { num } {
     return {[expr $num * 3]}
 }
 } [file join pkg pkg3.tcl]
+
 test pkgMkIndex-6.1 {pkg1 requires pkg3} {
     pkgtest::runIndex -lazy $fullPkgPath pkg1.tcl pkg3.tcl
 } {0 {{pkg1:1.0 {tclPkgSetup {pkg1.tcl source {::pkg1::p1-1 ::pkg1::p1-2}}}} {pkg3:1.0 {tclPkgSetup {pkg3.tcl source {::pkg3::p3-1 ::pkg3::p3-2}}}}}}
@@ -486,37 +421,27 @@ test pkgMkIndex-6.1 {pkg1 requires pkg3} {
 test pkgMkIndex-6.2 {pkg1 requires pkg3 - use -direct} {
     pkgtest::runIndex -direct $fullPkgPath pkg1.tcl pkg3.tcl
 } "0 {{pkg1:1.0 {[list source [file join $fullPkgPath pkg1.tcl]]}} {pkg3:1.0 {[list source [file join $fullPkgPath pkg3.tcl]]}}}"
+
 removeFile [file join pkg pkg1.tcl]
 
 makeFile {
-# pkg4.tcl --
-#
-#  Test package for pkg_mkIndex. This package requires pkg3, and it calls
+#  This package requires pkg3, and it calls
 #  a pkg3 proc in the code that is executed by the file
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: pkgMkIndex.test,v 1.21 2002/07/04 00:32:54 dgp Exp $
-
 package require pkg3 1.0
-
 package provide pkg4 1.0
-
 namespace eval pkg4 {
     namespace export p4-1 p4-2
     variable m2 [pkg3::p3-1 10]
 }
-
 proc pkg4::p4-1 { num } {
     variable m2
     return [expr {$m2 * $num}]
 }
-
 proc pkg4::p4-2 { num } {
     return [pkg3::p3-2 $num]
 }
 } [file join pkg pkg4.tcl]
+
 test pkgMkIndex-7.1 {pkg4 uses pkg3} {
     pkgtest::runIndex -lazy $fullPkgPath pkg4.tcl pkg3.tcl
 } {0 {{pkg3:1.0 {tclPkgSetup {pkg3.tcl source {::pkg3::p3-1 ::pkg3::p3-2}}}} {pkg4:1.0 {tclPkgSetup {pkg4.tcl source {::pkg4::p4-1 ::pkg4::p4-2}}}}}}
@@ -524,41 +449,31 @@ test pkgMkIndex-7.1 {pkg4 uses pkg3} {
 test pkgMkIndex-7.2 {pkg4 uses pkg3 - use -direct} {
     pkgtest::runIndex -direct $fullPkgPath pkg4.tcl pkg3.tcl
 } "0 {{pkg3:1.0 {[list source [file join $fullPkgPath pkg3.tcl]]}} {pkg4:1.0 {[list source [file join $fullPkgPath pkg4.tcl]]}}}"
+
 removeFile [file join pkg pkg4.tcl]
 removeFile [file join pkg pkg3.tcl]
 
 makeFile {
-# pkg5.tcl --
-#
-#  Test package for pkg_mkIndex. This package requires pkg2, and it calls
+#  This package requires pkg2, and it calls
 #  a pkg2 proc in the code that is executed by the file.
 #  Pkg2 is a split package.
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: pkgMkIndex.test,v 1.21 2002/07/04 00:32:54 dgp Exp $
-
 package require pkg2 1.0
-
 package provide pkg5 1.0
-
 namespace eval pkg5 {
     namespace export p5-1 p5-2
     variable m2 [pkg2::p2-1 10]
     variable m3 [pkg2::p2-2 10]
 }
-
 proc pkg5::p5-1 { num } {
     variable m2
     return [expr {$m2 * $num}]
 }
-
 proc pkg5::p5-2 { num } {
     variable m2
     return [expr {$m2 * $num}]
 }
 } [file join pkg pkg5.tcl]
+
 test pkgMkIndex-8.1 {pkg5 uses pkg2} {
     pkgtest::runIndex -lazy $fullPkgPath pkg5.tcl pkg2_a.tcl pkg2_b.tcl
 } {0 {{pkg2:1.0 {tclPkgSetup {pkg2_a.tcl source ::pkg2::p2-1} {pkg2_b.tcl source ::pkg2::p2-2}}} {pkg5:1.0 {tclPkgSetup {pkg5.tcl source {::pkg5::p5-1 ::pkg5::p5-2}}}}}}
@@ -567,103 +482,70 @@ test pkgMkIndex-8.2 {pkg5 uses pkg2 - use -direct} {
     pkgtest::runIndex -direct $fullPkgPath pkg5.tcl pkg2_a.tcl pkg2_b.tcl
 } "0 {{pkg2:1.0 {[list source [file join $fullPkgPath pkg2_a.tcl]]
 [list source [file join $fullPkgPath pkg2_b.tcl]]}} {pkg5:1.0 {[list source [file join $fullPkgPath pkg5.tcl]]}}}"
+
 removeFile [file join pkg pkg5.tcl]
 removeFile [file join pkg pkg2_a.tcl]
 removeFile [file join pkg pkg2_b.tcl]
 
 makeFile {
-# circ1.tcl --
-#
-#  Test package for pkg_mkIndex. This package requires circ2, and circ2
+#  This package requires circ2, and circ2
 #  requires circ3, which in turn requires circ1.
 #  In case of cirularities, pkg_mkIndex should give up when it gets stuck.
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: pkgMkIndex.test,v 1.21 2002/07/04 00:32:54 dgp Exp $
-
 package require circ2 1.0
-
 package provide circ1 1.0
-
 namespace eval circ1 {
     namespace export c1-1 c1-2 c1-3 c1-4
 }
-
 proc circ1::c1-1 { num } {
     return [circ2::c2-1 $num]
 }
-
 proc circ1::c1-2 { num } {
     return [circ2::c2-2 $num]
 }
-
 proc circ1::c1-3 {} {
     return 10
 }
-
 proc circ1::c1-4 {} {
     return 20
 }
 } [file join pkg circ1.tcl]
+
 makeFile {
-# circ2.tcl --
-#
-#  Test package for pkg_mkIndex. This package is required by circ1, and
+#  This package is required by circ1, and
 #  requires circ3. Circ3, in turn, requires circ1 to give us a circularity.
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: pkgMkIndex.test,v 1.21 2002/07/04 00:32:54 dgp Exp $
-
 package require circ3 1.0
-
 package provide circ2 1.0
-
 namespace eval circ2 {
     namespace export c2-1 c2-2
 }
-
 proc circ2::c2-1 { num } {
     return [expr $num * [circ3::c3-1]]
 }
-
 proc circ2::c2-2 { num } {
     return [expr $num * [circ3::c3-2]]
 }
 } [file join pkg circ2.tcl]
+
 makeFile {
-# circ3.tcl --
-#
-#  Test package for pkg_mkIndex. This package is required by circ2, and in
+#  This package is required by circ2, and in
 #  turn requires circ1. This closes the circularity.
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: pkgMkIndex.test,v 1.21 2002/07/04 00:32:54 dgp Exp $
-
 package require circ1 1.0
-
 package provide circ3 1.0
-
 namespace eval circ3 {
     namespace export c3-1 c3-4
 }
-
 proc circ3::c3-1 {} {
     return [circ1::c1-3]
 }
-
 proc circ3::c3-2 {} {
     return [circ1::c1-4]
 }
 } [file join pkg circ3.tcl]
+
 test pkgMkIndex-9.1 {circular packages} {
     pkgtest::runIndex -lazy $fullPkgPath circ1.tcl circ2.tcl circ3.tcl
 } {0 {{circ1:1.0 {tclPkgSetup {circ1.tcl source {::circ1::c1-1 ::circ1::c1-2 ::circ1::c1-3 ::circ1::c1-4}}}} {circ2:1.0 {tclPkgSetup {circ2.tcl source {::circ2::c2-1 ::circ2::c2-2}}}} {circ3:1.0 {tclPkgSetup {circ3.tcl source ::circ3::c3-1}}}}}
+
 removeFile [file join pkg circ1.tcl]
 removeFile [file join pkg circ2.tcl]
 removeFile [file join pkg circ3.tcl]
@@ -675,24 +557,15 @@ set dll "[file tail $x]Required"
 ::tcltest::testConstraint $dll [file exists $x]
 
 makeFile {
-# pkga.tcl --
-#
-#  Test package for pkg_mkIndex. This package provides Pkga,
-#  which is also provided by a DLL.
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: pkgMkIndex.test,v 1.21 2002/07/04 00:32:54 dgp Exp $
-
+#  This package provides Pkga, which is also provided by a DLL.
 package provide Pkga 1.0
-
 proc pkga_neq { x } {
     return [expr {! [pkgq_eq $x]}]
 }
 } [file join pkg pkga.tcl]
 file copy -force $x $fullPkgPath
 testConstraint exec [llength [info commands ::exec]]
+
 test pkgMkIndex-10.1 {package in DLL and script} [list exec $dll] {
     # Do all [load]ing of shared libraries in another process, so 
     # we can delete the file and not get stuck because we're holding
@@ -713,6 +586,7 @@ test pkgMkIndex-10.2 {package in DLL hidden by -load} [list exec $dll] {
     exec [interpreter] << $script
     pkgtest::runCreatedIndex {0 {}} -lazy -load Pkg* -- $fullPkgPath pkga[info sharedlibextension]
 } {0 {}}
+
 file delete -force [file join $fullPkgPath [file tail $x]]
 removeFile [file join pkg pkga.tcl]
 
@@ -720,25 +594,23 @@ removeFile [file join pkg pkga.tcl]
 
 makeFile {
 package provide fubar 1.0
-    
 namespace eval ::fubar:: {
     #
     # export only public functions.
     #
     namespace export {[a-z]*}
 }
-
 proc ::fubar::foo {bar} {
     puts "$bar"
     return true
 }
-
 namespace import ::fubar::foo
-
 } [file join pkg import.tcl]
+
 test pkgMkIndex-11.1 {conflicting namespace imports} {
     pkgtest::runIndex -lazy $fullPkgPath import.tcl
 } {0 {{fubar:1.0 {tclPkgSetup {import.tcl source ::fubar::foo}}}}}
+
 removeFile [file join pkg import.tcl]
 
 # Verify that the auto load list generated is correct even when there
@@ -747,7 +619,6 @@ removeFile [file join pkg import.tcl]
 
 makeFile {
 package provide football 1.0
-    
 namespace eval ::pro:: {
     #
     # export only public functions.
@@ -760,21 +631,20 @@ namespace eval ::college:: {
     #
     namespace export {[a-z]*}
 }
-
 proc ::pro::team {} {
     puts "go packers!"
     return true
 }
-
 proc ::college::team {} {
     puts "go badgers!"
     return true
 }
-
 } [file join pkg samename.tcl]
+
 test pkgMkIndex-12.1 {same name procs in different namespace} {
     pkgtest::runIndex -lazy $fullPkgPath samename.tcl
 } {0 {{football:1.0 {tclPkgSetup {samename.tcl source {::college::team ::pro::team}}}}}}
+
 removeFile [file join pkg samename.tcl]
 
 # Proc names with embedded spaces are properly listed (ie, correct number of
@@ -784,9 +654,11 @@ package provide spacename 1.0
 proc {a b} {} {}
 proc {c d} {} {}
 } [file join pkg spacename.tcl]
+
 test pkgMkIndex-13.1 {proc names with embedded spaces} {
     pkgtest::runIndex -lazy $fullPkgPath spacename.tcl
 } {0 {{spacename:1.0 {tclPkgSetup {spacename.tcl source {{a b} {c d}}}}}}}
+
 removeFile [file join pkg spacename.tcl]
 
 # Test the pkg_compareExtension helper function