From 0f71efe445ad4662978569586156bba150cef23c Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Tue, 21 Jan 2020 08:48:17 +0000 Subject: Don't run stack-3.1 test on OSX, it fail regulary. Don't really bother for Tcl 8.5 any more. --- tests/stack.test | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/stack.test b/tests/stack.test index 62c3e98..2cc9d47 100644 --- a/tests/stack.test +++ b/tests/stack.test @@ -12,6 +12,8 @@ package require tcltest 2 namespace import ::tcltest::* +testConstraint noOsx [expr {[info exists ::env(TRAVIS_OSX_IMAGE)] && [string match xcode* $::env(TRAVIS_OSX_IMAGE)]}] + # Note that a failure in this test results in a crash of the executable. # In order to avoid that, we do a basic check of the current stacksize. # This size can be changed with ulimit (ksh/bash/sh) or limit (csh/tcsh). @@ -68,7 +70,7 @@ test stack-2.1 {maxNestingDepth reached on infinite recursion} -constraints { # Make sure that there is enough stack to run regexp even if we're # close to the recursion limit. [Bug 947070] [Patch 746378] -test stack-3.1 {enough room for regexp near recursion limit} -body { +test stack-3.1 {enough room for regexp near recursion limit} -constraints noOsx -body { # do this in a sub process in case it segfaults exec [interpreter] << { interp recursionlimit {} 10000 -- cgit v0.12 From ad096310ec004ae12fc9509dd5cb891146eb3520 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Thu, 23 Jan 2020 08:29:26 +0000 Subject: Last unused internal stub entry from 258 to 259. --- generic/tclInt.decls | 31 +++++++++++++++---------------- generic/tclIntDecls.h | 9 ++++++--- generic/tclStubInit.c | 3 ++- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/generic/tclInt.decls b/generic/tclInt.decls index 2b3b89d..93a436a 100644 --- a/generic/tclInt.decls +++ b/generic/tclInt.decls @@ -73,7 +73,7 @@ declare 11 { declare 12 { void TclDeleteVars(Interp *iPtr, TclVarHashTable *tablePtr) } -# Removed in 8.5 +# Removed in 8.5: #declare 13 { # int TclDoGlob(Tcl_Interp *interp, char *separators, # Tcl_DString *headPtr, char *tail, Tcl_GlobTypeData *types) @@ -88,7 +88,7 @@ declare 14 { declare 16 { void TclExprFloatError(Tcl_Interp *interp, double value) } -# Removed in 8.4 +# Removed in 8.4: #declare 17 { # int TclFileAttrsCmd(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) #} @@ -123,7 +123,7 @@ declare 25 { # declare 26 { # char *TclGetCwd(Tcl_Interp *interp) # } -# Removed in 8.5 +# Removed in 8.5: #declare 27 { # int TclGetDate(char *p, unsigned long now, long zone, # unsigned long *timePtr) @@ -147,7 +147,7 @@ declare 32 { int TclGetFrame(Tcl_Interp *interp, const char *str, CallFrame **framePtrPtr) } -# Removed in Tcl 8.5 +# Removed in 8.5: #declare 33 { # TclCmdProcType TclGetInterpProc(void) #} @@ -184,9 +184,9 @@ declare 41 { declare 42 { char *TclpGetUserHome(const char *name, Tcl_DString *bufferPtr) } -# Removed in Tcl 8.5a2 +# Removed in 8.5a2: #declare 43 { -# int TclGlobalInvoke(Tcl_Interp *interp, int argc, CONST84 char **argv, +# int TclGlobalInvoke(Tcl_Interp *interp, int argc, const char **argv, # int flags) #} declare 44 { @@ -219,9 +219,9 @@ declare 50 { declare 51 { int TclInterpInit(Tcl_Interp *interp) } -# Removed in Tcl 8.5a2 +# Removed in 8.5a2: #declare 52 { -# int TclInvoke(Tcl_Interp *interp, int argc, CONST84 char **argv, +# int TclInvoke(Tcl_Interp *interp, int argc, const char **argv, # int flags) #} declare 53 { @@ -272,7 +272,7 @@ declare 64 { int TclObjInvoke(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], int flags) } -# Removed in Tcl 8.5a2 +# Removed in 8.5a2: #declare 65 { # int TclObjInvokeGlobal(Tcl_Interp *interp, int objc, # Tcl_Obj *const objv[], int flags) @@ -378,9 +378,9 @@ declare 92 { declare 93 { void TclProcDeleteProc(ClientData clientData) } -# Removed in Tcl 8.5: +# Removed in 8.5: #declare 94 { -# int TclProcInterpProc(ClientData clientData, Tcl_Interp *interp, +# int TclProcInterpProc(void *clientData, Tcl_Interp *interp, # int argc, const char **argv) #} # Replaced by Tcl_FSStat in 8.4: @@ -553,7 +553,7 @@ declare 138 { #declare 139 { # int TclpLoadFile(Tcl_Interp *interp, char *fileName, char *sym1, # char *sym2, Tcl_PackageInitProc **proc1Ptr, -# Tcl_PackageInitProc **proc2Ptr, ClientData *clientDataPtr) +# Tcl_PackageInitProc **proc2Ptr, void **clientDataPtr) #} #declare 140 { # int TclLooksLikeInt(const char *bytes, int length) @@ -608,11 +608,11 @@ declare 153 { # moved to tclTest.c (static) in 8.3.2/8.4a2 #declare 154 { -# int TclTestChannelCmd(ClientData clientData, +# int TclTestChannelCmd(void *clientData, # Tcl_Interp *interp, int argc, char **argv) #} #declare 155 { -# int TclTestChannelEventCmd(ClientData clientData, +# int TclTestChannelEventCmd(void *clientData, # Tcl_Interp *interp, int argc, char **argv) #} @@ -945,10 +945,9 @@ declare 249 { int *decpt, int *signum, char **endPtr) } -declare 258 { +declare 259 { void TclUnusedStubEntry(void) } - ############################################################################## diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h index 6e74d36..fe23e77 100644 --- a/generic/tclIntDecls.h +++ b/generic/tclIntDecls.h @@ -1064,9 +1064,10 @@ EXTERN char * TclDoubleDigits(double dv, int ndigits, int flags, /* Slot 255 is reserved */ /* Slot 256 is reserved */ /* Slot 257 is reserved */ +/* Slot 258 is reserved */ #ifndef TclUnusedStubEntry_TCL_DECLARED #define TclUnusedStubEntry_TCL_DECLARED -/* 258 */ +/* 259 */ EXTERN void TclUnusedStubEntry(void); #endif @@ -1332,7 +1333,8 @@ typedef struct TclIntStubs { VOID *reserved255; VOID *reserved256; VOID *reserved257; - void (*tclUnusedStubEntry) (void); /* 258 */ + VOID *reserved258; + void (*tclUnusedStubEntry) (void); /* 259 */ } TclIntStubs; extern TclIntStubs *tclIntStubsPtr; @@ -2070,9 +2072,10 @@ extern TclIntStubs *tclIntStubsPtr; /* Slot 255 is reserved */ /* Slot 256 is reserved */ /* Slot 257 is reserved */ +/* Slot 258 is reserved */ #ifndef TclUnusedStubEntry #define TclUnusedStubEntry \ - (tclIntStubsPtr->tclUnusedStubEntry) /* 258 */ + (tclIntStubsPtr->tclUnusedStubEntry) /* 259 */ #endif #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */ diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index b78febc..239cf60 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -558,7 +558,8 @@ TclIntStubs tclIntStubs = { NULL, /* 255 */ NULL, /* 256 */ NULL, /* 257 */ - TclUnusedStubEntry, /* 258 */ + NULL, /* 258 */ + TclUnusedStubEntry, /* 259 */ }; TclIntPlatStubs tclIntPlatStubs = { -- cgit v0.12