From: Tom Yu <tlyu@mit.edu>
Date: Tue, 28 Jun 2011 22:11:51 +0000 (+0000)
Subject: work around Dejagnu failure on modern Tcl
X-Git-Tag: krb5-1.8.5-beta1~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=56c85bfd1d748b14a2ace68c79694198468bb9e6;p=krb5.git

work around Dejagnu failure on modern Tcl

Modern releases of Tcl (8.5 and later?) require use the special
procedure "unknown" to implement some autoloading functionality.
Dejagnu replaces "unknown" with its own definition, without chaining
to the original version of "unknown".  This causes "clock format
[clock seconds]" to fail while trying to load the "msgcat" Tcl
package.

Use "exec date" instead of "clock format [clock seconds]" to work
around this bug.

(Also needs pullup to 1.7.)

ticket: 6926
version_fixed: 1.8.5

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-8@24999 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index 79afd09e6..d8390e790 100644
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -1619,7 +1619,7 @@ proc start_tail { fname spawnid_var pid_var which standalone } {
     set spawnid $spawn_id
     set pid [exp_pid]
 
-    set markstr "===MARK $pid [clock format [clock seconds]] ==="
+    set markstr "===MARK $pid [exec date] ==="
     puts $f $markstr
     flush $f