diff options
author | dgp <dgp@users.sourceforge.net> | 2004-10-26 23:22:59 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2004-10-26 23:22:59 (GMT) |
commit | 49f35fcfc9ae3237a21dea1a0d10496d25aecd1a (patch) | |
tree | 54e05130f9ac14726b309d42355a37e0b17a57bf /unix | |
parent | b485f2b4fade260ea9fcb8a29751b2315eb801af (diff) | |
download | tk-49f35fcfc9ae3237a21dea1a0d10496d25aecd1a.zip tk-49f35fcfc9ae3237a21dea1a0d10496d25aecd1a.tar.gz tk-49f35fcfc9ae3237a21dea1a0d10496d25aecd1a.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.in | 8 |
1 files changed, 7 insertions, 1 deletions
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 |