summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2002-07-06 18:19:45 (GMT)
committerdgp <dgp@users.sourceforge.net>2002-07-06 18:19:45 (GMT)
commit68b9c133991e6b15f963215b186d3b21c52ec9ce (patch)
treecabe6db4f59851bed1e66da9c06916876204275d
parentaf44831b78945cce22b370f8a9185a5758064d9a (diff)
downloadtcl-68b9c133991e6b15f963215b186d3b21c52ec9ce.zip
tcl-68b9c133991e6b15f963215b186d3b21c52ec9ce.tar.gz
tcl-68b9c133991e6b15f963215b186d3b21c52ec9ce.tar.bz2
* tests/pkgMkIndex.test: Constrained tests of [load] package indexing
to those platforms where the testing shared libraries have been built. [Bug 578166].
-rw-r--r--ChangeLog7
-rw-r--r--tests/pkgMkIndex.test6
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 06f5da1..922e6e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
-2002-07-05 Don Porter <dgp@users.sourceforge.net>
+2002-07-06 Don Porter <dgp@users.sourceforge.net>
+
+ * tests/pkgMkIndex.test: Constrained tests of [load] package indexing
+ to those platforms where the testing shared libraries have been built.
+ [Bug 578166].
+2002-07-05 Don Porter <dgp@users.sourceforge.net>
* changes: added recent changes
2002-07-05 Reinhard Max <max@suse.de>
diff --git a/tests/pkgMkIndex.test b/tests/pkgMkIndex.test
index bf3ae18..104ef8b 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.22 2002/07/04 01:20:37 dgp Exp $
+# RCS: @(#) $Id: pkgMkIndex.test,v 1.23 2002/07/06 18:19:46 dgp Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest 2
@@ -556,6 +556,7 @@ set x [file join [file dirname [info nameofexecutable]] dltest \
set dll "[file tail $x]Required"
::tcltest::testConstraint $dll [file exists $x]
+if {[testConstraint $dll]} {
makeFile {
# This package provides Pkga, which is also provided by a DLL.
package provide Pkga 1.0
@@ -564,6 +565,7 @@ proc pkga_neq { 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] {
@@ -587,8 +589,10 @@ test pkgMkIndex-10.2 {package in DLL hidden by -load} [list exec $dll] {
pkgtest::runCreatedIndex {0 {}} -lazy -load Pkg* -- $fullPkgPath pkga[info sharedlibextension]
} {0 {}}
+if {[testConstraint $dll]} {
file delete -force [file join $fullPkgPath [file tail $x]]
removeFile [file join pkg pkga.tcl]
+}
# Tolerate "namespace import" at the global scope