diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | tests/safe.test | 6 | ||||
| -rw-r--r-- | unix/Makefile.in | 8 |
3 files changed, 20 insertions, 4 deletions
@@ -1,3 +1,13 @@ +2004-10-26 Don Porter <dgp@users.sourceforge.net> + + * tests/safe.test (safe-1.3): Made test less sensitve to the + full set of existing aliases in an interp, so the it only tests + whether the tested ones are present. + + * unix/Makefile.in: Copied LD_LIBRARY_PATH machinery from + `make shell` target to other similar targets so that just built + libraries are tested, rather than previous installations. + 2004-10-26 Reinhard Max <max@suse.de> * generic/tkEvent.c (Tk_HandleEvent): Call XSetICFocus whenever diff --git a/tests/safe.test b/tests/safe.test index 060a1e1..45976c3 100644 --- a/tests/safe.test +++ b/tests/safe.test @@ -6,7 +6,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: safe.test,v 1.10 2002/09/02 19:16:24 hobbs Exp $ +# RCS: @(#) $Id: safe.test,v 1.10.2.1 2004/10/26 23:23:13 dgp Exp $ package require tcltest 2.1 namespace import -force tcltest::configure @@ -60,14 +60,14 @@ test safe-1.2 {Safe Tk loading into an interpreter} { safe::interpDelete a set l } $hidden_cmds -test safe-1.3 {Safe Tk loading into an interpreter} { +test safe-1.3 {Safe Tk loading into an interpreter} -body { catch {safe::interpDelete a} safe::interpCreate a safe::loadTk a set l [lsort [interp aliases a]] safe::interpDelete a set l -} {encoding exit file load source} +} -match glob -result {*encoding*exit*file*load*source*} test safe-2.1 {Unsafe commands not available} { catch {safe::interpDelete a} diff --git a/unix/Makefile.in b/unix/Makefile.in index 913b2ce..8b53e26 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.87.2.3 2004/07/19 20:30:01 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.87.2.4 2004/10/26 23:23:14 dgp Exp $ # Current Tk version; used in various names. @@ -457,6 +457,8 @@ xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE) # % make test TESTFLAGS="-verbose bps -file fileName.test" test: tktest + @LD_LIBRARY_PATH_VAR@=`pwd`:${TCL_BIN_DIR}:${@LD_LIBRARY_PATH_VAR@}; \ + export @LD_LIBRARY_PATH_VAR@; \ TCL_LIBRARY=@TCL_SRC_DIR@/library; export TCL_LIBRARY; \ TK_LIBRARY=@TK_SRC_DIR@/library; export TK_LIBRARY; \ ./tktest $(TOP_DIR)/tests/all.tcl -geometry +0+0 \ @@ -464,6 +466,8 @@ test: tktest # Tests with different languages testlang: tktest + @LD_LIBRARY_PATH_VAR@=`pwd`:${TCL_BIN_DIR}:${@LD_LIBRARY_PATH_VAR@}; \ + export @LD_LIBRARY_PATH_VAR@; \ TCL_LIBRARY=@TCL_SRC_DIR@/library; export TCL_LIBRARY; \ TK_LIBRARY=@TK_SRC_DIR@/library; export TK_LIBRARY; \ for lang in $(LOCALES) ; \ @@ -475,6 +479,8 @@ testlang: tktest # Useful target to launch a built tktest with the proper path,... runtest: tktest + @LD_LIBRARY_PATH_VAR@=`pwd`:${TCL_BIN_DIR}:${@LD_LIBRARY_PATH_VAR@}; \ + export @LD_LIBRARY_PATH_VAR@; \ TCL_LIBRARY=@TCL_SRC_DIR@/library; export TCL_LIBRARY; \ TK_LIBRARY=@TK_SRC_DIR@/library; export TK_LIBRARY; \ ./tktest |