summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2000-09-29 21:40:53 (GMT)
committerhobbs <hobbs>2000-09-29 21:40:53 (GMT)
commit8432fe13edf65bc1a15b64fc6cff20397391e9fe (patch)
treeafb58f3a6afd136e4686e9bc42cf6413d3877d5b
parent95fc05c4b143e413f10ddc9cb14e4d322cca5e94 (diff)
downloadtk-8432fe13edf65bc1a15b64fc6cff20397391e9fe.zip
tk-8432fe13edf65bc1a15b64fc6cff20397391e9fe.tar.gz
tk-8432fe13edf65bc1a15b64fc6cff20397391e9fe.tar.bz2
* win/Makefile.in: commented use of TESTFLAGS
* unix/Makefile.in: added TESTFLAGS to test and testlang targets to conform with Windows makefile and TEA style.
-rw-r--r--ChangeLog6
-rw-r--r--unix/Makefile.in11
-rw-r--r--win/Makefile.in6
3 files changed, 19 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index dc54921..d4b33ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-29 Jeff Hobbs <hobbs@scriptics.com>
+
+ * win/Makefile.in: commented use of TESTFLAGS
+ * unix/Makefile.in: added TESTFLAGS to test and testlang targets to
+ conform with Windows makefile and TEA style.
+
2000-09-29 Eric Melski <ericm@ajubasolutions.com>
* generic/tkTest.c: Fixed tests to use updated API.
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 6f81666..2fe60ef 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.48 2000/09/02 01:18:24 ericm Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.49 2000/09/29 21:40:54 hobbs Exp $
# Current Tk version; used in various names.
@@ -408,6 +408,9 @@ xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
# Note, in the target below TCL_LIBRARY needs to be set or else
# "make test" won't work in the case where the compilation directory
# isn't the same as the source directory.
+# Specifying TESTFLAGS on the command line is the standard way to pass
+# args to tcltest, ie:
+# % make test TESTFLAGS="-verbose bps -file fileName.test"
test: tktest
LD_LIBRARY_PATH=`pwd`:${TCL_BIN_DIR}:${LD_LIBRARY_PATH}; \
@@ -417,7 +420,8 @@ test: tktest
export SHLIB_PATH; \
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 $(TCLTESTARGS)
+ ./tktest $(TOP_DIR)/tests/all.tcl -geometry +0+0 \
+ $(TESTFLAGS) $(TCLTESTARGS)
# Tests with different languages
testlang: tktest
@@ -431,7 +435,8 @@ testlang: tktest
for lang in $(LOCALES) ; \
do \
LANG=$(lang); export LANG; \
- ./tktest $(TOP_DIR)/tests/all.tcl -geometry +0+0 $(TCLTESTARGS); \
+ ./tktest $(TOP_DIR)/tests/all.tcl -geometry +0+0 \
+ $(TESTFLAGS) $(TCLTESTARGS); \
done
# Useful target to launch a built tktest with the proper path,...
diff --git a/win/Makefile.in b/win/Makefile.in
index cee6a9d..38c2455 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.30 2000/09/02 01:18:24 ericm Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.31 2000/09/29 21:40:54 hobbs Exp $
TCLVERSION = @TCL_VERSION@
VERSION = @TK_VERSION@
@@ -380,6 +380,10 @@ winhelp: $(TCL_SRC_DIR_NATIVE)/../tools/man2help.tcl $(MAN2TCL)
$(MAN2TCL): $(TCL_SRC_DIR_NATIVE)/../tools/man2tcl.c
$(CC) $(CFLAGS_OPTIMIZE) $(MAN2TCLFLAGS) -o $(MAN2TCL) "$(TCL_SRC_DIR_NATIVE)"/../tools/man2tcl.c
+# Specifying TESTFLAGS on the command line is the standard way to pass
+# args to tcltest, ie:
+# % make test TESTFLAGS="-verbose bps -file fileName.test"
+
test: binaries $(TKTEST)
@TCL_LIBRARY="$(TCL_SRC_DIR_NATIVE)/../library"; export TCL_LIBRARY; \
TK_LIBRARY="$(ROOT_DIR_NATIVE)/library"; export TK_LIBRARY; \