diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-15 09:24:27 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-15 09:24:27 (GMT) |
| commit | e51ff962f0ed5b1d7f9a8661a3147894ee0fa49a (patch) | |
| tree | 7f753a050da4131605dc9543b908403a107a0f09 | |
| parent | e3f7f1bad8178c56aa5e8ddb994c218c30ec0f45 (diff) | |
| parent | f3ae2684eb9584f9f0ca5e6bdcaabd75347e3224 (diff) | |
| download | tcl-e51ff962f0ed5b1d7f9a8661a3147894ee0fa49a.zip tcl-e51ff962f0ed5b1d7f9a8661a3147894ee0fa49a.tar.gz tcl-e51ff962f0ed5b1d7f9a8661a3147894ee0fa49a.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | tests/safe.test | 4 | ||||
| -rw-r--r-- | unix/Makefile.in | 1 | ||||
| -rw-r--r-- | win/Makefile.in | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index e597512..69eadd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -445,6 +445,7 @@ jobs: script: - make dist before_install: + - rm -rf tests/safe-stock8*.test - touch generic/tclStubInit.c generic/tclOOStubInit.c generic/tclOOScript.h - cd ${BUILD_DIR} install: diff --git a/tests/safe.test b/tests/safe.test index ebaedabe..1177e19 100644 --- a/tests/safe.test +++ b/tests/safe.test @@ -12,7 +12,7 @@ # - Tests 5.* test the example packages themselves before they # are used to test Safe Base interpreters. # - Alternative tests using stock packages of Tcl 8.7 are in file -# safe-stock87.test. +# safe-stock.test. # # Copyright (c) 1995-1996 Sun Microsystems, Inc. # Copyright (c) 1998-1999 by Scriptics Corporation. @@ -169,7 +169,7 @@ test safe-4.6 {safe::interpDelete, indirectly} -setup { a eval exit } -result "" -# The old test "safe-5.1" has been moved to "safe-stock87-9.8". +# The old test "safe-5.1" has been moved to "safe-stock-9.8". # A replacement test using example files is "safe-9.8". # Tests 5.* test the example files before using them to test safe interpreters. diff --git a/unix/Makefile.in b/unix/Makefile.in index 9df3a5f..bf8e0e6 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -866,7 +866,6 @@ SHELL_ENV = @LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@} \ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}" ${TCLTEST_EXE}: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${TCL_STUB_LIB_FILE} ${BUILD_DLTEST} - rm -rf $(TOP_DIR)/tests/safe-stock86.test $(MAKE) tcltest-real LIB_RUNTIME_DIR="`pwd`" tcltest-real: diff --git a/win/Makefile.in b/win/Makefile.in index f1b72e1..9757c2e 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -596,7 +596,6 @@ ${TEST_DLL_FILE}: ${TCL_STUB_LIB_FILE} ${TCLTEST_OBJS} ${TEST_EXE_FILE}: ${TCL_STUB_LIB_FILE} ${TCLTEST_OBJS} tclTestMain.${OBJEXT} @$(RM) ${TEST_EXE_FILE} - @$(RM) $(ROOT_DIR_NATIVE)/tests/safe-stock86.test $(CC) $(CFLAGS) $(TCLTEST_OBJS) tclTestMain.$(OBJEXT) $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(LIBS) \ tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE) $(COPY) tclsh.exe.manifest ${TEST_EXE_FILE}.manifest |