summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2004-08-19 17:59:17 (GMT)
committerdgp <dgp@users.sourceforge.net>2004-08-19 17:59:17 (GMT)
commit761e7d71f0ee9ed7468499164161302214a757c5 (patch)
tree3f628b976049e15ad751b0243c741e260f953d8e /unix
parent24dc049bfc8735be09a2d5cdfdac2ee9f6295aa4 (diff)
downloadtk-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.
Diffstat (limited to 'unix')
-rw-r--r--unix/Makefile.in8
1 files changed, 7 insertions, 1 deletions
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