From 1704d23d60d9f21edb117206e36ce0cf911ef376 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 24 Nov 2020 14:45:38 +0000
Subject: Fix testcases on Windows. Use more "info loaded" as appropriate

---
 tests/chanio.test  | 2 +-
 tests/event.test   | 2 +-
 tests/io.test      | 2 +-
 tests/winDde.test  | 2 +-
 tests/winPipe.test | 2 +-
 win/Makefile.in    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/chanio.test b/tests/chanio.test
index 16244e2..4f5c328 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -37,7 +37,7 @@ namespace eval ::tcl::test::io {
     catch {
 	::tcltest::loadTestedCommands
 	package require -exact tcl::test [info patchlevel]
-	set ::tcltestlib [lindex [package ifneeded tcl::test [info patchlevel]] 1]
+	set ::tcltestlib [info loaded {} Tcltest]
     }
     package require tcltests
 
diff --git a/tests/event.test b/tests/event.test
index ba52e30..85c17d6 100644
--- a/tests/event.test
+++ b/tests/event.test
@@ -15,7 +15,7 @@ namespace import -force ::tcltest::*
 catch {
     ::tcltest::loadTestedCommands
     package require -exact tcl::test [info patchlevel]
-    set ::tcltestlib [lindex [package ifneeded tcl::test [info patchlevel]] 1]
+    set ::tcltestlib [info loaded {} Tcltest]
 }
 
 
diff --git a/tests/io.test b/tests/io.test
index 0aa4ebf..230a7e1 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -32,7 +32,7 @@ namespace eval ::tcl::test::io {
     catch {
 	::tcltest::loadTestedCommands
 	package require -exact tcl::test [info patchlevel]
-	set ::tcltestlib [lindex [package ifneeded tcl::test [info patchlevel]] 1]
+	set ::tcltestlib [info loaded {} Tcltest]
     }
     package require tcltests
 
diff --git a/tests/winDde.test b/tests/winDde.test
index 9d15357..2b85d5c 100644
--- a/tests/winDde.test
+++ b/tests/winDde.test
@@ -20,7 +20,7 @@ if {[testConstraint win]} {
     if {![catch {
 	    ::tcltest::loadTestedCommands
 	    set ::ddever [package require dde 1.4.3]
-	    set ::ddelib [info loaded "" Dde]}]} {
+	    set ::ddelib [info loaded {} Dde]}]} {
 	testConstraint dde 1
     }
 }
diff --git a/tests/winPipe.test b/tests/winPipe.test
index 25b5517..d1418cf 100644
--- a/tests/winPipe.test
+++ b/tests/winPipe.test
@@ -21,7 +21,7 @@ unset -nocomplain path
 catch {
     ::tcltest::loadTestedCommands
     package require -exact tcl::test [info patchlevel]
-    set ::tcltestlib [lindex [package ifneeded tcl::test [info patchlevel]] 1]
+    set ::tcltestlib [info loaded {} Tcltest]
 }
 
 set org_pwd [pwd]
diff --git a/win/Makefile.in b/win/Makefile.in
index fe3dfa1..2351209 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -158,7 +158,7 @@ TEST_LIB_FILE		= @LIBPREFIX@tcltest$(VER)${DLLSUFFIX}${LIBSUFFIX}
 TEST_LOAD_PRMS		= lappend ::auto_path {$(ROOT_DIR_WIN_NATIVE)/tests};\
 			  package ifneeded dde 1.4.3 [list load [file normalize ${DDE_DLL_FILE}]];\
 			  package ifneeded registry 1.3.5 [list load [file normalize ${REG_DLL_FILE}]]
-TEST_LOAD_FACILITIES	= package ifneeded tcl::test ${VERSION}@TCL_PATCH_LEVEL@ [list load [file normalize ${TEST_DLL_FILE}]];\
+TEST_LOAD_FACILITIES	= package ifneeded tcl::test ${VERSION}@TCL_PATCH_LEVEL@ [list load [file normalize ${TEST_DLL_FILE}] Tcltest];\
 			  $(TEST_LOAD_PRMS)
 ZLIB_DLL_FILE		= zlib1.dll
 TOMMATH_DLL_FILE		= libtommath.dll
-- 
cgit v0.12