13 files changed, 318 insertions, 0 deletions
diff --git a/tcl/tests/pkg/circ1.tcl b/tcl/tests/pkg/circ1.tcl
new file mode 100644
index 00000000000..a8e7f9a557a
--- /dev/null
+++ b/tcl/tests/pkg/circ1.tcl
@@ -0,0 +1,34 @@
+# circ1.tcl --
+#
+#  Test package for pkg_mkIndex. 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$
+
+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
+}
diff --git a/tcl/tests/pkg/circ2.tcl b/tcl/tests/pkg/circ2.tcl
new file mode 100644
index 00000000000..d9bc7c50928
--- /dev/null
+++ b/tcl/tests/pkg/circ2.tcl
@@ -0,0 +1,25 @@
+# circ2.tcl --
+#
+#  Test package for pkg_mkIndex. 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$
+
+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]]
+}
diff --git a/tcl/tests/pkg/circ3.tcl b/tcl/tests/pkg/circ3.tcl
new file mode 100644
index 00000000000..72ef502a2a3
--- /dev/null
+++ b/tcl/tests/pkg/circ3.tcl
@@ -0,0 +1,25 @@
+# circ3.tcl --
+#
+#  Test package for pkg_mkIndex. 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$
+
+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]
+}
diff --git a/tcl/tests/pkg/global.tcl b/tcl/tests/pkg/global.tcl
new file mode 100644
index 00000000000..a1689745aa2
--- /dev/null
+++ b/tcl/tests/pkg/global.tcl
@@ -0,0 +1,19 @@
+# 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$
+
+package provide global 1.0
+
+proc global_lower { stg } {
+    return [string tolower $stg]
+}
+
+proc global_upper { stg } {
+    return [string toupper $stg]
+}
diff --git a/tcl/tests/pkg/pkg1.tcl b/tcl/tests/pkg/pkg1.tcl
new file mode 100644
index 00000000000..7d029f3e80a
--- /dev/null
+++ b/tcl/tests/pkg/pkg1.tcl
@@ -0,0 +1,26 @@
+# pkg1.tcl --
+#
+#  Test package for pkg_mkIndex. 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$
+
+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]
+}
diff --git a/tcl/tests/pkg/pkg2_a.tcl b/tcl/tests/pkg/pkg2_a.tcl
new file mode 100644
index 00000000000..85e16c4eec3
--- /dev/null
+++ b/tcl/tests/pkg/pkg2_a.tcl
@@ -0,0 +1,22 @@
+# pkg2_a.tcl --
+#
+#  Test package for pkg_mkIndex. 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]
+}
diff --git a/tcl/tests/pkg/pkg2_b.tcl b/tcl/tests/pkg/pkg2_b.tcl
new file mode 100644
index 00000000000..15fb1a85822
--- /dev/null
+++ b/tcl/tests/pkg/pkg2_b.tcl
@@ -0,0 +1,22 @@
+# pkg2_b.tcl --
+#
+#  Test package for pkg_mkIndex. 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]
+}
diff --git a/tcl/tests/pkg/pkg3.tcl b/tcl/tests/pkg/pkg3.tcl
new file mode 100644
index 00000000000..d9c450444f9
--- /dev/null
+++ b/tcl/tests/pkg/pkg3.tcl
@@ -0,0 +1,22 @@
+# pkg3.tcl --
+#
+#  Test package for pkg_mkIndex.
+#
+# Copyright (c) 1998 by Scriptics Corporation.
+# All rights reserved.
+# 
+# RCS: @(#) $Id$
+
+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]}
+}
diff --git a/tcl/tests/pkg/pkg4.tcl b/tcl/tests/pkg/pkg4.tcl
new file mode 100644
index 00000000000..36587c92874
--- /dev/null
+++ b/tcl/tests/pkg/pkg4.tcl
@@ -0,0 +1,27 @@
+# pkg4.tcl --
+#
+#  Test package for pkg_mkIndex. 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$
+
+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]
+}
diff --git a/tcl/tests/pkg/pkg5.tcl b/tcl/tests/pkg/pkg5.tcl
new file mode 100644
index 00000000000..2d2073b0cde
--- /dev/null
+++ b/tcl/tests/pkg/pkg5.tcl
@@ -0,0 +1,30 @@
+# pkg5.tcl --
+#
+#  Test package for pkg_mkIndex. 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$
+
+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}]
+}
diff --git a/tcl/tests/pkg/pkga.tcl b/tcl/tests/pkg/pkga.tcl
new file mode 100644
index 00000000000..cb10a2de89f
--- /dev/null
+++ b/tcl/tests/pkg/pkga.tcl
@@ -0,0 +1,15 @@
+# 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$
+
+package provide Pkga 1.0
+
+proc pkga_neq { x } {
+    return [expr {! [pkgq_eq $x]}]
+}
diff --git a/tcl/tests/pkg/simple.tcl b/tcl/tests/pkg/simple.tcl
new file mode 100644
index 00000000000..73f49e3ac49
--- /dev/null
+++ b/tcl/tests/pkg/simple.tcl
@@ -0,0 +1,23 @@
+# 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$
+
+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]
+}
diff --git a/tcl/tests/pkg/std.tcl b/tcl/tests/pkg/std.tcl
new file mode 100644
index 00000000000..ceb518d2eb9
--- /dev/null
+++ b/tcl/tests/pkg/std.tcl
@@ -0,0 +1,28 @@
+# 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$
+
+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]
+}