Index: tests/pkgMkIndex.test
===================================================================
RCS file: /cvsroot/tcl/tcl/tests/pkgMkIndex.test,v
retrieving revision 1.18
diff -u -r1.18 pkgMkIndex.test
--- tests/pkgMkIndex.test	12 Jan 2001 09:54:16 -0000	1.18
+++ tests/pkgMkIndex.test	27 Apr 2002 21:17:51 -0000
@@ -270,11 +270,15 @@
 
 test pkgMkIndex-2.2 {simple package - use -direct} {
     pkgtest::runIndex -direct $fullPkgPath simple.tcl
-} "0 {{simple:1.0 {source [file join $fullPkgPath simple.tcl]}}}"
+} [list 0 \
+	[list [list simple:1.0 \
+	            [list source [file join $fullPkgPath simple.tcl]]]]]
 
 test pkgMkIndex-2.3 {simple package - direct loading is default} {
     pkgtest::runIndex $fullPkgPath simple.tcl
-} "0 {{simple:1.0 {source [file join $fullPkgPath simple.tcl]}}}"
+} [list 0 \
+        [list [list simple:1.0 \
+                    [list source [file join $fullPkgPath simple.tcl]]]]]
 
 test pkgMkIndex-3.1 {simple package with global symbols} {
     pkgtest::runIndex -lazy $fullPkgPath global.tcl
@@ -286,8 +290,8 @@
 
 test pkgMkIndex-4.2 {split package - direct loading} {
     pkgtest::runIndex -direct $fullPkgPath pkg2_a.tcl pkg2_b.tcl
-} "0 {{pkg2:1.0 {source [file join $fullPkgPath pkg2_a.tcl]
-source [file join $fullPkgPath pkg2_b.tcl]}}}"
+} -result [list 0 \
+                [list [list pkg2:1.0 [list source [file join $fullPkgPath pkg2_a.tcl]]\n[list source [file join $fullPkgPath pkg2_b.tcl]]]]]
 
 # This will fail, with "direct1" procedures in the list of procedures
 # provided by std.
@@ -305,7 +309,11 @@
 
 test pkgMkIndex-6.2 {pkg1 requires pkg3 - use -direct} {
     pkgtest::runIndex -direct $fullPkgPath pkg1.tcl pkg3.tcl
-} "0 {{pkg1:1.0 {source [file join $fullPkgPath pkg1.tcl]}} {pkg3:1.0 {source [file join $fullPkgPath pkg3.tcl]}}}"
+} [list 0 \
+        [list [list pkg1:1.0 \
+                    [list source [file join $fullPkgPath pkg1.tcl]]] \
+              [list pkg3:1.0 \
+                    [list source [file join $fullPkgPath pkg3.tcl]]]]]  
 
 test pkgMkIndex-7.1 {pkg4 uses pkg3} {
     pkgtest::runIndex -lazy $fullPkgPath pkg4.tcl pkg3.tcl
@@ -313,7 +321,11 @@
 
 test pkgMkIndex-7.2 {pkg4 uses pkg3 - use -direct} {
     pkgtest::runIndex -direct $fullPkgPath pkg4.tcl pkg3.tcl
-} "0 {{pkg3:1.0 {source [file join $fullPkgPath pkg3.tcl]}} {pkg4:1.0 {source [file join $fullPkgPath pkg4.tcl]}}}"
+} [list 0 \
+        [list [list pkg3:1.0 \
+                    [list source [file join $fullPkgPath pkg3.tcl]]] \
+              [list pkg4:1.0 \
+                    [list source [file join $fullPkgPath pkg4.tcl]]]]]
 
 test pkgMkIndex-8.1 {pkg5 uses pkg2} {
     pkgtest::runIndex -lazy $fullPkgPath pkg5.tcl pkg2_a.tcl pkg2_b.tcl
@@ -321,8 +333,11 @@
 
 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 {source [file join $fullPkgPath pkg2_a.tcl]
-source [file join $fullPkgPath pkg2_b.tcl]}} {pkg5:1.0 {source [file join $fullPkgPath pkg5.tcl]}}}"
+} [list 0 \
+	[list [list pkg2:1.0 \
+                    [list source [file join $fullPkgPath pkg2_a.tcl]]\n[list source [file join $fullPkgPath pkg2_b.tcl]]] \
+              [list pkg5:1.0 \
+                    [list source [file join $fullPkgPath pkg5.tcl]]]]]
 
 test pkgMkIndex-9.1 {circular packages} {
     pkgtest::runIndex -lazy $fullPkgPath circ1.tcl circ2.tcl circ3.tcl
