diff options
| author | dgp <dgp@users.sourceforge.net> | 2004-08-19 17:59:17 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2004-08-19 17:59:17 (GMT) |
| commit | 761e7d71f0ee9ed7468499164161302214a757c5 (patch) | |
| tree | 3f628b976049e15ad751b0243c741e260f953d8e | |
| parent | 24dc049bfc8735be09a2d5cdfdac2ee9f6295aa4 (diff) | |
| download | tk-761e7d71f0ee9ed7468499164161302214a757c5.zip tk-761e7d71f0ee9ed7468499164161302214a757c5.tar.gz tk-761e7d71f0ee9ed7468499164161302214a757c5.tar.bz2 | |
* 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.
| -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-08-19 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-08-19 Donal K. Fellows <donal.k.fellows@man.ac.uk> TIP#168 IMPLEMENTATION diff --git a/tests/safe.test b/tests/safe.test index e70b675..b9232b3 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.13 2004/03/17 18:15:49 das Exp $ +# RCS: @(#) $Id: safe.test,v 1.14 2004/08/19 17:59:18 dgp Exp $ package require tcltest 2.1 eval tcltest::configure $argv @@ -55,14 +55,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 663369f..0a759a6 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.95 2004/07/20 10:23:51 das Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.96 2004/08/19 17:59:18 dgp Exp $ # Current Tk version; used in various names. @@ -473,6 +473,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 \ @@ -480,6 +482,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) ; \ @@ -491,6 +495,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 |