summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--tests/all.tcl4
-rw-r--r--tests/ttk/all.tcl28
3 files changed, 26 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 6c69b2e..e0af50e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-18 Pat Thoyts <patthoyts@users.sourceforge.net>
+
+ * tests/all.tcl: Made ttk/all.tcl be the same as tk's
+ * tests/ttk/all.tcl: all.tcl and make use of file normalize
+ (bugs noted by mjanssen and GPS with msys)
+
2007-09-17 Pat Thoyts <patthoyts@users.sourceforge.net>
* win/makefile.vc: Add crt flags for tkStubLib now it uses
diff --git a/tests/all.tcl b/tests/all.tcl
index 11eaece..426d698 100644
--- a/tests/all.tcl
+++ b/tests/all.tcl
@@ -9,13 +9,13 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: all.tcl,v 1.11 2007/08/21 20:30:27 patthoyts Exp $
+# RCS: @(#) $Id: all.tcl,v 1.12 2007/09/18 10:39:52 patthoyts Exp $
package require Tcl 8.5
package require tcltest 2.2
package require Tk ;# This is the Tk test suite; fail early if no Tk!
tcltest::configure {*}$argv
-tcltest::configure -testdir [file join [pwd] [file dirname [info script]]]
+tcltest::configure -testdir [file normalize [file dirname [info script]]]
tcltest::configure -loadfile \
[file join [tcltest::testsDirectory] constraints.tcl]
tcltest::configure -singleproc 1
diff --git a/tests/ttk/all.tcl b/tests/ttk/all.tcl
index 75aa035..d2fab16 100644
--- a/tests/ttk/all.tcl
+++ b/tests/ttk/all.tcl
@@ -1,15 +1,23 @@
+# all.tcl --
#
-# source all tests.
+# This file contains a top-level script to run all of the ttk
+# tests. Execute it by invoking "source all.tcl" when running tktest
+# in this directory.
#
-package require tcltest 2.1
-
-package require Tk 8.5 ;# This is the Tk test suite; fail early if no Tk!
-
-tcltest::configure -testdir [file join [pwd] [file dirname [info script]]]
+# Copyright (c) 2007 by the Tk developers.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: all.tcl,v 1.2 2007/09/18 10:39:52 patthoyts Exp $
-eval tcltest::configure $::argv
+package require Tcl 8.5
+package require tcltest 2.2
+package require Tk ;# This is the Tk test suite; fail early if no Tk!
+tcltest::configure {*}$argv
+tcltest::configure -testdir [file normalize [file dirname [info script]]]
+tcltest::configure -loadfile \
+ [file join [file dirname [tcltest::testsDirectory]] constraints.tcl]
+tcltest::configure -singleproc 1
tcltest::runAllTests
-if {![catch { package present Tk }]} {
- destroy .
-}