summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--generic/tclTest.c4
-rw-r--r--tests/link.test8
3 files changed, 7 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index bbd8429..e913820 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,8 @@
* generic/tcl.h: to link to, making it
* doc/LinkVar.3: easier to seamlessly
* generic/tclTest.c (TestlinkCmd): couple C code and Tcl
- scripts in an application. [Patch 1242844]
+ * tests/link.test: scripts in an
+ application. [Patch 1242844]
2005-09-07 Don Porter <dgp@users.sourceforge.net>
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 1c44d17..641c781 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -14,7 +14,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclTest.c,v 1.94 2005/09/08 13:40:08 dkf Exp $
+ * RCS: @(#) $Id: tclTest.c,v 1.95 2005/09/08 14:09:05 dkf Exp $
*/
#define TCL_TEST
@@ -2560,7 +2560,6 @@ TestlinkCmd(dummy, interp, argc, argv)
static double realVar = 1.23;
static Tcl_WideInt wideVar = Tcl_LongAsWide(79);
static char *stringVar = NULL;
-
static char charVar = '@';
static unsigned char ucharVar = 130;
static short shortVar = 3000;
@@ -2570,7 +2569,6 @@ TestlinkCmd(dummy, interp, argc, argv)
static unsigned long ulongVar = 3456789012;
static float floatVar = 4.5;
static Tcl_WideUInt uwideVar = (Tcl_WideUInt) Tcl_LongAsWide(123);
-
static int created = 0;
char buffer[2*TCL_DOUBLE_SPACE];
int writable, flag;
diff --git a/tests/link.test b/tests/link.test
index 32367c2..8bbc029 100644
--- a/tests/link.test
+++ b/tests/link.test
@@ -11,7 +11,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: link.test,v 1.11 2005/09/08 14:05:06 dkf Exp $
+# RCS: @(#) $Id: link.test,v 1.12 2005/09/08 14:09:06 dkf Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest 2
@@ -55,8 +55,8 @@ test link-2.1 {writing C variables from Tcl} {testlink} {
set ulong 567890
set float 1.0987654321
set uwide 357357357357
- concat [testlink get] | $int $real $bool $string $wide
-} {465 -10.5 1 abcdef 135135 79 161 8000 40000 -1073628482 34543 567890 ? 357357357357 | 00721 -10.5 true abcdef 135135 79 161 8000 40000 -1073628482 34543 567890 ? 357357357357}
+ concat [testlink get] | $int $real $bool $string $wide $char $uchar $short $ushort $uint $long $ulong $float $uwide
+} {465 -10.5 1 abcdef 135135 79 161 8000 40000 -1073628482 34543 567890 1.0987653732299805 357357357357 | 00721 -10.5 true abcdef 135135 79 161 8000 40000 -1073628482 34543 567890 1.0987653732299805 357357357357}
test link-2.2 {writing bad values into variables} {testlink} {
testlink delete
testlink set 43 1.23 4 - 56785678 64 250 30000 60000 0xbeefbabe 12321 32123 3.25 1231231234
@@ -144,7 +144,7 @@ test link-5.1 {unlinking variables} {testlink} {
set float dskjfbjfd
set uwide isdfsngs
testlink get
-} {-6 -2.25 0 stringValue 13579 64 250 30000 60000 0xbeefbabe 12321 32123 3.25 1231231234}
+} {-6 -2.25 0 stringValue 13579 64 250 30000 60000 -1091585346 12321 32123 3.25 1231231234}
test link-5.2 {unlinking variables} {testlink} {
testlink delete
testlink set -6 -2.25 0 stringValue 97531 64 250 30000 60000 0xbeefbabe 12321 32123 3.25 1231231234