diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-08 09:33:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-08 09:33:28 (GMT) |
| commit | 92bd8b3a3f380903aa8f6e7221c2d4aba012a88a (patch) | |
| tree | 0cab68ff4f115f1be5154fee4ae490dd01959dcc | |
| parent | ec01eef200318de0c4ec4236258febc61e836b58 (diff) | |
| parent | 5039e7ce17a9ea6c7352b39a0bd70e31433b7843 (diff) | |
| download | tcl-92bd8b3a3f380903aa8f6e7221c2d4aba012a88a.zip tcl-92bd8b3a3f380903aa8f6e7221c2d4aba012a88a.tar.gz tcl-92bd8b3a3f380903aa8f6e7221c2d4aba012a88a.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | generic/tclFileName.c | 10 | ||||
| -rw-r--r-- | tests/fileName.test | 6 |
3 files changed, 21 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index ab80836..e597512 100644 --- a/.travis.yml +++ b/.travis.yml @@ -122,7 +122,7 @@ jobs: # Testing on Mac, various styles - name: "macOS/Clang/Xcode 12/Shared" os: osx - osx_image: xcode12 + osx_image: xcode12.2 env: - BUILD_DIR=macosx install: [] @@ -132,12 +132,13 @@ jobs: - make test styles=develop - name: "macOS/Clang/Xcode 12/Shared/Unix-like" os: osx - osx_image: xcode112 + osx_image: xcode12.2 env: - BUILD_DIR=unix + - CFGOPT="--enable-dtrace" - name: "macOS/Clang/Xcode 12/Shared/libtommath" os: osx - osx_image: xcode12 + osx_image: xcode12.2 env: - BUILD_DIR=macosx install: [] @@ -148,10 +149,10 @@ jobs: - libtommath - name: "macOS/Clang++/Xcode 12/Shared" os: osx - osx_image: xcode12 + osx_image: xcode12.2 env: - BUILD_DIR=unix - - CFGOPT="CC=clang++ --enable-framework CFLAGS=-Dregister=dont+use+register CPPFLAGS=-D__private_extern__=extern" + - CFGOPT="CC=clang++ --enable-framework --enable-dtrace CFLAGS=-Dregister=dont+use+register CPPFLAGS=-D__private_extern__=extern" script: - make all tcltest # Newer MacOS versions @@ -444,6 +445,7 @@ jobs: script: - make dist before_install: + - touch generic/tclStubInit.c generic/tclOOStubInit.c generic/tclOOScript.h - cd ${BUILD_DIR} install: - mkdir "$HOME/install dir" diff --git a/generic/tclFileName.c b/generic/tclFileName.c index 4c0125f..ca4dc5b 100644 --- a/generic/tclFileName.c +++ b/generic/tclFileName.c @@ -1283,7 +1283,10 @@ Tcl_GlobObjCmd( } if (dir != PATH_NONE) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "\"-directory\" cannot be used with \"-path\"", -1)); + dir == PATH_DIR + ? "\"-directory\" may only be used once" + : "\"-directory\" cannot be used with \"-path\"", + -1)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB", "BADOPTIONCOMBINATION", NULL); return TCL_ERROR; @@ -1308,7 +1311,10 @@ Tcl_GlobObjCmd( } if (dir != PATH_NONE) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "\"-path\" cannot be used with \"-directory\"", -1)); + dir == PATH_GENERAL + ? "\"-path\" may only be used once" + : "\"-path\" cannot be used with \"-dictionary\"", + -1)); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB", "BADOPTIONCOMBINATION", NULL); return TCL_ERROR; diff --git a/tests/fileName.test b/tests/fileName.test index d4dfd9a..c73efac 100644 --- a/tests/fileName.test +++ b/tests/fileName.test @@ -1084,6 +1084,12 @@ test filename-11.48 {Tcl_GlobCmd} -returnCodes error -body { test filename-11.49 {Tcl_GlobCmd} -returnCodes error -body { glob -types abcde -path foo -join * * } -result {bad argument to "-types": abcde} +test filename-11.50 {Tcl_GlobCmd} -returnCodes error -body { + glob -path hello -path salut * +} -result {"-path" may only be used once} +test filename-11.51 {Tcl_GlobCmd} -returnCodes error -body { + glob -dir hello -dir salut * +} -result {"-directory" may only be used once} file rename $horribleglobname globTest file delete -force $tildeglobname |