Attachment "tcl-nomac2.diff" to
ticket [918142ffff]
added by
das
2004-03-18 00:31:59.
Index: generic/tclPort.h
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclPort.h,v
retrieving revision 1.7
diff -u -p -r1.7 tclPort.h
--- generic/tclPort.h 16 Apr 2003 23:33:44 -0000 1.7
+++ generic/tclPort.h 17 Mar 2004 16:00:03 -0000
@@ -21,11 +21,7 @@
#if defined(__WIN32__)
# include "../win/tclWinPort.h"
#else
-# if defined(MAC_TCL)
-# include "tclMacPort.h"
-# else
-# include "../unix/tclUnixPort.h"
-# endif
+# include "../unix/tclUnixPort.h"
#endif
#if !defined(LLONG_MIN)
Index: generic/tclStubInit.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclStubInit.c,v
retrieving revision 1.92
diff -u -p -r1.92 tclStubInit.c
--- generic/tclStubInit.c 21 Jan 2004 19:59:33 -0000 1.92
+++ generic/tclStubInit.c 17 Mar 2004 16:00:03 -0000
@@ -46,7 +46,7 @@
Tcl_NotifierProcs tclOriginalNotifier = {
Tcl_SetTimer,
Tcl_WaitForEvent,
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
Tcl_CreateFileHandler,
Tcl_DeleteFileHandler,
#else
@@ -75,27 +75,21 @@ TclIntStubs tclIntStubs = {
TclAccessInsertProc, /* 2 */
TclAllocateFreeObjects, /* 3 */
NULL, /* 4 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
TclCleanupChildren, /* 5 */
#endif /* UNIX */
#ifdef __WIN32__
TclCleanupChildren, /* 5 */
#endif /* __WIN32__ */
-#ifdef MAC_TCL
- NULL, /* 5 */
-#endif /* MAC_TCL */
TclCleanupCommand, /* 6 */
TclCopyAndCollapse, /* 7 */
TclCopyChannel, /* 8 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
TclCreatePipeline, /* 9 */
#endif /* UNIX */
#ifdef __WIN32__
TclCreatePipeline, /* 9 */
#endif /* __WIN32__ */
-#ifdef MAC_TCL
- NULL, /* 9 */
-#endif /* MAC_TCL */
TclCreateProc, /* 10 */
TclDeleteCompiledLocalVars, /* 11 */
TclDeleteVars, /* 12 */
@@ -190,15 +184,12 @@ TclIntStubs tclIntStubs = {
TclSetPreInitScript, /* 101 */
TclSetupEnv, /* 102 */
TclSockGetPort, /* 103 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
TclSockMinimumBuffers, /* 104 */
#endif /* UNIX */
#ifdef __WIN32__
TclSockMinimumBuffers, /* 104 */
#endif /* __WIN32__ */
-#ifdef MAC_TCL
- NULL, /* 104 */
-#endif /* MAC_TCL */
NULL, /* 105 */
TclStatDeleteProc, /* 106 */
TclStatInsertProc, /* 107 */
@@ -281,7 +272,7 @@ TclIntStubs tclIntStubs = {
TclIntPlatStubs tclIntPlatStubs = {
TCL_STUB_MAGIC,
NULL,
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
TclGetAndDetachPids, /* 0 */
TclpCloseFile, /* 1 */
TclpCreateCommandChannel, /* 2 */
@@ -329,35 +320,6 @@ TclIntPlatStubs tclIntPlatStubs = {
TclWinFlushDirtyChannels, /* 27 */
TclWinResetInterfaces, /* 28 */
#endif /* __WIN32__ */
-#ifdef MAC_TCL
- TclpSysAlloc, /* 0 */
- TclpSysFree, /* 1 */
- TclpSysRealloc, /* 2 */
- TclpExit, /* 3 */
- FSpGetDefaultDir, /* 4 */
- FSpSetDefaultDir, /* 5 */
- FSpFindFolder, /* 6 */
- GetGlobalMouseTcl, /* 7 */
- FSpGetDirectoryIDTcl, /* 8 */
- FSpOpenResFileCompatTcl, /* 9 */
- FSpCreateResFileCompatTcl, /* 10 */
- FSpLocationFromPath, /* 11 */
- FSpPathFromLocation, /* 12 */
- TclMacExitHandler, /* 13 */
- TclMacInitExitToShell, /* 14 */
- TclMacInstallExitToShellPatch, /* 15 */
- TclMacOSErrorToPosixError, /* 16 */
- TclMacRemoveTimer, /* 17 */
- TclMacStartTimer, /* 18 */
- TclMacTimerExpired, /* 19 */
- TclMacRegisterResourceFork, /* 20 */
- TclMacUnRegisterResourceFork, /* 21 */
- TclMacCreateEnv, /* 22 */
- TclMacFOpenHack, /* 23 */
- TclpGetTZName, /* 24 */
- TclMacChmod, /* 25 */
- FSpLLocationFromPath, /* 26 */
-#endif /* MAC_TCL */
#ifdef MAC_OSX_TCL
TclMacOSXGetFileAttribute, /* 15 */
TclMacOSXSetFileAttribute, /* 16 */
@@ -372,17 +334,6 @@ TclPlatStubs tclPlatStubs = {
Tcl_WinUtfToTChar, /* 0 */
Tcl_WinTCharToUtf, /* 1 */
#endif /* __WIN32__ */
-#ifdef MAC_TCL
- Tcl_MacSetEventProc, /* 0 */
- Tcl_MacConvertTextResource, /* 1 */
- Tcl_MacEvalResource, /* 2 */
- Tcl_MacFindResource, /* 3 */
- Tcl_GetOSTypeFromObj, /* 4 */
- Tcl_SetOSTypeObj, /* 5 */
- Tcl_NewOSTypeObj, /* 6 */
- strncasecmp, /* 7 */
- strcasecmp, /* 8 */
-#endif /* MAC_TCL */
#ifdef MAC_OSX_TCL
Tcl_MacOSXOpenBundleResources, /* 0 */
Tcl_MacOSXOpenVersionedBundleResources, /* 1 */
@@ -407,24 +358,18 @@ TclStubs tclStubs = {
Tcl_DbCkalloc, /* 6 */
Tcl_DbCkfree, /* 7 */
Tcl_DbCkrealloc, /* 8 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
Tcl_CreateFileHandler, /* 9 */
#endif /* UNIX */
#ifdef __WIN32__
NULL, /* 9 */
#endif /* __WIN32__ */
-#ifdef MAC_TCL
- NULL, /* 9 */
-#endif /* MAC_TCL */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
Tcl_DeleteFileHandler, /* 10 */
#endif /* UNIX */
#ifdef __WIN32__
NULL, /* 10 */
#endif /* __WIN32__ */
-#ifdef MAC_TCL
- NULL, /* 10 */
-#endif /* MAC_TCL */
Tcl_SetTimer, /* 11 */
Tcl_Sleep, /* 12 */
Tcl_WaitForEvent, /* 13 */
@@ -525,15 +470,12 @@ TclStubs tclStubs = {
Tcl_DeleteHashEntry, /* 108 */
Tcl_DeleteHashTable, /* 109 */
Tcl_DeleteInterp, /* 110 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
Tcl_DetachPids, /* 111 */
#endif /* UNIX */
#ifdef __WIN32__
Tcl_DetachPids, /* 111 */
#endif /* __WIN32__ */
-#ifdef MAC_TCL
- NULL, /* 111 */
-#endif /* MAC_TCL */
Tcl_DeleteTimerHandler, /* 112 */
Tcl_DeleteTrace, /* 113 */
Tcl_DontCallWhenDeleted, /* 114 */
@@ -589,15 +531,12 @@ TclStubs tclStubs = {
Tcl_GetMaster, /* 164 */
Tcl_GetNameOfExecutable, /* 165 */
Tcl_GetObjResult, /* 166 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
Tcl_GetOpenFile, /* 167 */
#endif /* UNIX */
#ifdef __WIN32__
NULL, /* 167 */
#endif /* __WIN32__ */
-#ifdef MAC_TCL
- NULL, /* 167 */
-#endif /* MAC_TCL */
Tcl_GetPathType, /* 168 */
Tcl_Gets, /* 169 */
Tcl_GetsObj, /* 170 */
@@ -627,15 +566,12 @@ TclStubs tclStubs = {
Tcl_NotifyChannel, /* 194 */
Tcl_ObjGetVar2, /* 195 */
Tcl_ObjSetVar2, /* 196 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
Tcl_OpenCommandChannel, /* 197 */
#endif /* UNIX */
#ifdef __WIN32__
Tcl_OpenCommandChannel, /* 197 */
#endif /* __WIN32__ */
-#ifdef MAC_TCL
- NULL, /* 197 */
-#endif /* MAC_TCL */
Tcl_OpenFileChannel, /* 198 */
Tcl_OpenTcpClient, /* 199 */
Tcl_OpenTcpServer, /* 200 */
@@ -645,15 +581,12 @@ TclStubs tclStubs = {
Tcl_PosixError, /* 204 */
Tcl_QueueEvent, /* 205 */
Tcl_Read, /* 206 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
Tcl_ReapDetachedProcs, /* 207 */
#endif /* UNIX */
#ifdef __WIN32__
Tcl_ReapDetachedProcs, /* 207 */
#endif /* __WIN32__ */
-#ifdef MAC_TCL
- NULL, /* 207 */
-#endif /* MAC_TCL */
Tcl_RecordAndEval, /* 208 */
Tcl_RecordAndEvalObj, /* 209 */
Tcl_RegisterChannel, /* 210 */
Index: generic/tclTest.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclTest.c,v
retrieving revision 1.79
diff -u -p -r1.79 tclTest.c
--- generic/tclTest.c 8 Mar 2004 16:34:23 -0000 1.79
+++ generic/tclTest.c 17 Mar 2004 16:00:03 -0000
@@ -3729,13 +3729,11 @@ TestsetplatformCmd(clientData, interp, a
length = strlen(argv[1]);
if (strncmp(argv[1], "unix", length) == 0) {
*platform = TCL_PLATFORM_UNIX;
- } else if (strncmp(argv[1], "mac", length) == 0) {
- *platform = TCL_PLATFORM_MAC;
} else if (strncmp(argv[1], "windows", length) == 0) {
*platform = TCL_PLATFORM_WINDOWS;
} else {
Tcl_AppendResult(interp, "unsupported platform: should be one of ",
- "unix, mac, or windows", (char *) NULL);
+ "unix, or windows", (char *) NULL);
return TCL_ERROR;
}
return TCL_OK;
@@ -4043,7 +4041,7 @@ TestpanicCmd(dummy, interp, argc, argv)
* TestchmodCmd --
*
* Implements the "testchmod" cmd. Used when testing "file"
- * command. The only attribute used by the Mac and Windows platforms
+ * command. The only attribute used by the Windows platform
* is the user write flag; if this is not set, the file is
* made read-only. Otehrwise, the file is made read-write.
*
@@ -4810,11 +4808,6 @@ static int PretendTclpStat(path, buf)
#endif /* TCL_WIDE_INT_IS_LONG */
}
-/* Be careful in the compares in these tests, since the Macintosh puts a
- * leading : in the beginning of non-absolute paths before passing them
- * into the file command procedures.
- */
-
static int
TestStatProc1(path, buf)
CONST char *path;
Index: generic/tclThreadJoin.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclThreadJoin.c,v
retrieving revision 1.4
diff -u -p -r1.4 tclThreadJoin.c
--- generic/tclThreadJoin.c 24 Apr 2002 20:35:40 -0000 1.4
+++ generic/tclThreadJoin.c 17 Mar 2004 16:00:03 -0000
@@ -2,8 +2,8 @@
* tclThreadJoin.c --
*
* This file implements a platform independent emulation layer for
- * the handling of joinable threads. The Mac and Windows platforms
- * use this code to provide the functionality of joining threads.
+ * the handling of joinable threads. The Windows platform
+ * uses this code to provide the functionality of joining threads.
* This code is currently not necessary on Unix.
*
* Copyright (c) 2000 by Scriptics Corporation
@@ -16,7 +16,7 @@
#include "tclInt.h"
-#if defined(WIN32) || defined(MAC_TCL)
+#if defined(WIN32)
/* The information about each joinable thread is remembered in a
* structure as defined below.
@@ -308,4 +308,4 @@ TclSignalExitThread(id,result)
Tcl_MutexUnlock (&threadPtr->threadMutex);
}
-#endif /* WIN32 || MAC_TCL */
+#endif /* WIN32 */
Index: library/auto.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/auto.tcl,v
retrieving revision 1.14
diff -u -p -r1.14 auto.tcl
--- library/auto.tcl 14 Nov 2003 20:44:45 -0000 1.14
+++ library/auto.tcl 17 Mar 2004 16:00:03 -0000
@@ -28,8 +28,7 @@ proc auto_reset {} {
if {[info exists auto_index($p)] && ![string match auto_* $p]
&& ([lsearch -exact {unknown pkg_mkIndex tclPkgSetup
tcl_findLibrary pkg_compareExtension
- tclPkgUnknown tcl::MacOSXPkgUnknown
- tcl::MacPkgUnknown} $p] < 0)} {
+ tclPkgUnknown tcl::MacOSXPkgUnknown} $p] < 0)} {
rename $p {}
}
}
Index: library/init.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/init.tcl,v
retrieving revision 1.59
diff -u -p -r1.59 init.tcl
--- library/init.tcl 29 Jan 2004 10:28:21 -0000 1.59
+++ library/init.tcl 17 Mar 2004 16:00:03 -0000
@@ -37,7 +37,6 @@ package require -exact Tcl 8.5
# tcl_pkgPath, which is set by the platform-specific initialization routines
# On UNIX it is compiled in
# On Windows, it is not used
-# On Macintosh it is "Tool Command Language" in the Extensions folder
if {![info exists auto_path]} {
if {[info exists env(TCLLIBPATH)]} {
@@ -119,16 +118,13 @@ if {![interp issafe]} {
[string equal $::tcl_platform(os) "Darwin"]} {
package unknown [list tcl::MacOSXPkgUnknown [package unknown]]
}
- if {[string equal $::tcl_platform(platform) "macintosh"]} {
- package unknown [list tcl::MacPkgUnknown [package unknown]]
- }
}
# Conditionalize for presence of exec.
if {[llength [info commands exec]] == 0} {
- # Some machines, such as the Macintosh, do not have exec. Also, on all
+ # Some machines do not have exec. Also, on all
# platforms, safe interpreters do not have exec.
set auto_noexec 1
Index: library/package.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/package.tcl,v
retrieving revision 1.27
diff -u -p -r1.27 package.tcl
--- library/package.tcl 14 Nov 2003 20:44:45 -0000 1.27
+++ library/package.tcl 17 Mar 2004 16:00:03 -0000
@@ -461,8 +461,7 @@ proc tclPkgSetup {dir pkg version files}
# It is invoked when a package that's needed can't be found. It scans
# the auto_path directories and their immediate children looking for
# pkgIndex.tcl files and sources any such files that are found to setup
-# the package database. (On the Macintosh we also search for pkgIndex
-# TEXT resources in all files.) As it searches, it will recognize changes
+# the package database. As it searches, it will recognize changes
# to the auto_path and scan any new directories.
#
# Arguments:
@@ -636,95 +635,6 @@ proc tcl::MacOSXPkgUnknown {original nam
}
}
-# tcl::MacPkgUnknown --
-# This procedure extends the "package unknown" function for Mac.
-# It searches for pkgIndex TEXT resources in all files
-# Only installed in interps that are not safe so we don't check
-# for [interp issafe] as in tclPkgUnknown.
-#
-# Arguments:
-# original - original [package unknown] procedure
-# name - Name of desired package. Not used.
-# version - Version of desired package. Not used.
-# exact - Either "-exact" or omitted. Not used.
-
-proc tcl::MacPkgUnknown {original name version {exact {}}} {
-
- # First do the cross-platform default search
- uplevel 1 $original [list $name $version $exact]
-
- # Now do Mac specific searching
- global auto_path
-
- if {![info exists auto_path]} {
- return
- }
- # Cache the auto_path, because it may change while we run through
- # the first set of pkgIndex.tcl files
- set old_path [set use_path $auto_path]
- while {[llength $use_path]} {
- # We look for pkgIndex TEXT resources in the resource fork of
- # shared libraries
- set dir [lindex $use_path end]
-
- # Make sure we only scan each directory one time.
- if {[info exists tclSeenPath($dir)]} {
- set use_path [lrange $use_path 0 end-1]
- continue
- }
- set tclSeenPath($dir) 1
-
- foreach x [concat [list $dir] [glob -directory $dir -nocomplain *] ] {
- if {![info exists procdDirs($x)] && [file isdirectory $x]} {
- set dir $x
- foreach x [glob -directory $dir -nocomplain *.shlb] {
- if {[file isfile $x]} {
- set res [resource open $x]
- foreach y [resource list TEXT $res] {
- if {[string equal $y "pkgIndex"]} {
- source -rsrc pkgIndex
- }
- }
- catch {resource close $res}
- }
- }
- set procdDirs($dir) 1
- }
- }
- set use_path [lrange $use_path 0 end-1]
-
- # Check whether any of the index scripts we [source]d above
- # set a new value for $::auto_path. If so, then find any
- # new directories on the $::auto_path, and lappend them to
- # the $use_path we are working from. This gives index scripts
- # the (arguably unwise) power to expand the index script search
- # path while the search is in progress.
- set index 0
- if {[llength $old_path] == [llength $auto_path]} {
- foreach dir $auto_path old $old_path {
- if {$dir ne $old} {
- # This entry in $::auto_path has changed.
- break
- }
- incr index
- }
- }
-
- # $index now points to the first element of $auto_path that
- # has changed, or the beginning if $auto_path has changed length
- # Scan the new elements of $auto_path for directories to add to
- # $use_path. Don't add directories we've already seen, or ones
- # already on the $use_path.
- foreach dir [lrange $auto_path $index end] {
- if {![info exists tclSeenPath($dir)]
- && ([lsearch -exact $use_path $dir] == -1) } {
- lappend use_path $dir
- }
- }
- set old_path $auto_path
- }
-}
-
# ::pkg::create --
#
# Given a package specification generate a "package ifneeded" statement
Index: library/safe.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/safe.tcl,v
retrieving revision 1.12
diff -u -p -r1.12 safe.tcl
--- library/safe.tcl 14 Nov 2003 20:44:45 -0000 1.12
+++ library/safe.tcl 17 Mar 2004 16:00:03 -0000
@@ -462,18 +462,6 @@ proc ::safe::interpAddToAccessPath {slav
# Source init.tcl into the slave, to get auto_load and other
# procedures defined:
- # We don't try to use the -rsrc on the mac because it would get
- # confusing if you would want to customize init.tcl
- # for a given set of safe slaves, on all the platforms
- # you just need to give a specific access_path and
- # the mac should be no exception. As there is no
- # obvious full "safe ressources" design nor implementation
- # for the mac, safe interps there will just don't
- # have that ability. (A specific app can still reenable
- # that using custom aliases if they want to).
- # It would also make the security analysis and the Safe Tcl security
- # model platform dependant and thus more error prone.
-
if {[catch {::interp eval $slave\
{source [file join $tcl_library init.tcl]}} msg]} {
Log $slave "can't source init.tcl ($msg)"
@@ -722,8 +710,6 @@ proc ::safe::setLogCmd {args} {
set argc [llength $args]
# Allow only "source filename"
- # (and not mac specific -rsrc for instance - see comment in ::init
- # for current rationale)
if {$argc != 1} {
set msg "wrong # args: should be \"source fileName\""
Log $slave "$msg ($args)"
Index: library/tclIndex
===================================================================
RCS file: /cvsroot/tcl/tcl/library/tclIndex,v
retrieving revision 1.6
diff -u -p -r1.6 tclIndex
--- library/tclIndex 28 Oct 2002 16:34:25 -0000 1.6
+++ library/tclIndex 17 Mar 2004 16:00:03 -0000
@@ -33,7 +33,6 @@ set auto_index(pkg_mkIndex) [list source
set auto_index(tclPkgSetup) [list source [file join $dir package.tcl]]
set auto_index(tclPkgUnknown) [list source [file join $dir package.tcl]]
set auto_index(::tcl::MacOSXPkgUnknown) [list source [file join $dir package.tcl]]
-set auto_index(::tcl::MacPkgUnknown) [list source [file join $dir package.tcl]]
set auto_index(::pkg::create) [list source [file join $dir package.tcl]]
set auto_index(parray) [list source [file join $dir parray.tcl]]
set auto_index(::safe::InterpStatics) [list source [file join $dir safe.tcl]]
Index: library/tcltest/tcltest.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/tcltest/tcltest.tcl,v
retrieving revision 1.87
diff -u -p -r1.87 tcltest.tcl
--- library/tcltest/tcltest.tcl 18 Feb 2004 01:41:42 -0000 1.87
+++ library/tcltest/tcltest.tcl 17 Mar 2004 16:00:03 -0000
@@ -1263,9 +1263,6 @@ proc tcltest::DefineConstraintInitialize
ConstraintInitializer unixExecs {
set code 1
- if {[string equal macintosh $::tcl_platform(platform)]} {
- set code 0
- }
if {[string equal windows $::tcl_platform(platform)]} {
if {[catch {
set file _tcl_test_remove_me.txt
Index: tests/all.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/tests/all.tcl,v
retrieving revision 1.16
diff -u -p -r1.16 all.tcl
--- tests/all.tcl 10 Apr 2002 19:57:15 -0000 1.16
+++ tests/all.tcl 17 Mar 2004 16:00:03 -0000
@@ -15,10 +15,6 @@
set tcltestVersion [package require tcltest]
namespace import -force tcltest::*
-if {$tcl_platform(platform) == "macintosh"} {
- tcltest::singleProcess 1
-}
-
tcltest::testsDirectory [file dir [info script]]
tcltest::runAllTests
Index: tests/binary.test
===================================================================
RCS file: /cvsroot/tcl/tcl/tests/binary.test,v
retrieving revision 1.13
diff -u -p -r1.13 binary.test
--- tests/binary.test 2 Dec 2003 09:29:54 -0000 1.13
+++ tests/binary.test 17 Mar 2004 16:00:04 -0000
@@ -426,37 +426,37 @@ test binary-13.2 {Tcl_BinaryObjCmd: form
test binary-13.3 {Tcl_BinaryObjCmd: format} {
binary format f0 1.6
} {}
-test binary-13.4 {Tcl_BinaryObjCmd: format} {nonPortable macOrUnix} {
+test binary-13.4 {Tcl_BinaryObjCmd: format} {nonPortable unixOnly} {
binary format f 1.6
} \x3f\xcc\xcc\xcd
test binary-13.5 {Tcl_BinaryObjCmd: format} {nonPortable pcOnly} {
binary format f 1.6
} \xcd\xcc\xcc\x3f
-test binary-13.6 {Tcl_BinaryObjCmd: format} {nonPortable macOrUnix} {
+test binary-13.6 {Tcl_BinaryObjCmd: format} {nonPortable unixOnly} {
binary format f* {1.6 3.4}
} \x3f\xcc\xcc\xcd\x40\x59\x99\x9a
test binary-13.7 {Tcl_BinaryObjCmd: format} {nonPortable pcOnly} {
binary format f* {1.6 3.4}
} \xcd\xcc\xcc\x3f\x9a\x99\x59\x40
-test binary-13.8 {Tcl_BinaryObjCmd: format} {nonPortable macOrUnix} {
+test binary-13.8 {Tcl_BinaryObjCmd: format} {nonPortable unixOnly} {
binary format f2 {1.6 3.4}
} \x3f\xcc\xcc\xcd\x40\x59\x99\x9a
test binary-13.9 {Tcl_BinaryObjCmd: format} {nonPortable pcOnly} {
binary format f2 {1.6 3.4}
} \xcd\xcc\xcc\x3f\x9a\x99\x59\x40
-test binary-13.10 {Tcl_BinaryObjCmd: format} {nonPortable macOrUnix} {
+test binary-13.10 {Tcl_BinaryObjCmd: format} {nonPortable unixOnly} {
binary format f2 {1.6 3.4 5.6}
} \x3f\xcc\xcc\xcd\x40\x59\x99\x9a
test binary-13.11 {Tcl_BinaryObjCmd: format} {nonPortable pcOnly} {
binary format f2 {1.6 3.4 5.6}
} \xcd\xcc\xcc\x3f\x9a\x99\x59\x40
-test binary-13.12 {Tcl_BinaryObjCmd: float overflow} {nonPortable macOrUnix} {
+test binary-13.12 {Tcl_BinaryObjCmd: float overflow} {nonPortable unixOnly} {
binary format f -3.402825e+38
} \xff\x7f\xff\xff
test binary-13.13 {Tcl_BinaryObjCmd: float overflow} {nonPortable pcOnly} {
binary format f -3.402825e+38
} \xff\xff\x7f\xff
-test binary-13.14 {Tcl_BinaryObjCmd: float underflow} {nonPortable macOrUnix} {
+test binary-13.14 {Tcl_BinaryObjCmd: float underflow} {nonPortable unixOnly} {
binary format f -3.402825e-100
} \x80\x00\x00\x00
test binary-13.15 {Tcl_BinaryObjCmd: float underflow} {nonPortable pcOnly} {
@@ -469,7 +469,7 @@ test binary-13.17 {Tcl_BinaryObjCmd: for
set a {1.6 3.4}
list [catch {binary format f $a} msg] $msg
} [list 1 "expected floating-point number but got \"1.6 3.4\""]
-test binary-13.18 {Tcl_BinaryObjCmd: format} {nonPortable macOrUnix} {
+test binary-13.18 {Tcl_BinaryObjCmd: format} {nonPortable unixOnly} {
set a {1.6 3.4}
binary format f1 $a
} \x3f\xcc\xcc\xcd
@@ -487,25 +487,25 @@ test binary-14.2 {Tcl_BinaryObjCmd: form
test binary-14.3 {Tcl_BinaryObjCmd: format} {
binary format d0 1.6
} {}
-test binary-14.4 {Tcl_BinaryObjCmd: format} {nonPortable macOrUnix} {
+test binary-14.4 {Tcl_BinaryObjCmd: format} {nonPortable unixOnly} {
binary format d 1.6
} \x3f\xf9\x99\x99\x99\x99\x99\x9a
test binary-14.5 {Tcl_BinaryObjCmd: format} {nonPortable pcOnly} {
binary format d 1.6
} \x9a\x99\x99\x99\x99\x99\xf9\x3f
-test binary-14.6 {Tcl_BinaryObjCmd: format} {nonPortable macOrUnix} {
+test binary-14.6 {Tcl_BinaryObjCmd: format} {nonPortable unixOnly} {
binary format d* {1.6 3.4}
} \x3f\xf9\x99\x99\x99\x99\x99\x9a\x40\x0b\x33\x33\x33\x33\x33\x33
test binary-14.7 {Tcl_BinaryObjCmd: format} {nonPortable pcOnly} {
binary format d* {1.6 3.4}
} \x9a\x99\x99\x99\x99\x99\xf9\x3f\x33\x33\x33\x33\x33\x33\x0b\x40
-test binary-14.8 {Tcl_BinaryObjCmd: format} {nonPortable macOrUnix} {
+test binary-14.8 {Tcl_BinaryObjCmd: format} {nonPortable unixOnly} {
binary format d2 {1.6 3.4}
} \x3f\xf9\x99\x99\x99\x99\x99\x9a\x40\x0b\x33\x33\x33\x33\x33\x33
test binary-14.9 {Tcl_BinaryObjCmd: format} {nonPortable pcOnly} {
binary format d2 {1.6 3.4}
} \x9a\x99\x99\x99\x99\x99\xf9\x3f\x33\x33\x33\x33\x33\x33\x0b\x40
-test binary-14.10 {Tcl_BinaryObjCmd: format} {nonPortable macOrUnix} {
+test binary-14.10 {Tcl_BinaryObjCmd: format} {nonPortable unixOnly} {
binary format d2 {1.6 3.4 5.6}
} \x3f\xf9\x99\x99\x99\x99\x99\x9a\x40\x0b\x33\x33\x33\x33\x33\x33
test binary-14.11 {Tcl_BinaryObjCmd: format} {nonPortable pcOnly} {
@@ -514,9 +514,6 @@ test binary-14.11 {Tcl_BinaryObjCmd: for
test binary-14.12 {Tcl_BinaryObjCmd: float overflow} {nonPortable unixOnly} {
binary format d NaN
} \x7f\xff\xff\xff\xff\xff\xff\xff
-test binary-14.13 {Tcl_BinaryObjCmd: float overflow} {nonPortable macOnly} {
- binary format d NaN
-} \x7f\xf8\x02\xa0\x00\x00\x00\x00
test binary-14.14 {Tcl_BinaryObjCmd: format} {
list [catch {binary format d2 {1.6}} msg] $msg
} {1 {number of elements in list does not match count}}
@@ -524,7 +521,7 @@ test binary-14.15 {Tcl_BinaryObjCmd: for
set a {1.6 3.4}
list [catch {binary format d $a} msg] $msg
} [list 1 "expected floating-point number but got \"1.6 3.4\""]
-test binary-14.16 {Tcl_BinaryObjCmd: format} {nonPortable macOrUnix} {
+test binary-14.16 {Tcl_BinaryObjCmd: format} {nonPortable unixOnly} {
set a {1.6 3.4}
binary format d1 $a
} \x3f\xf9\x99\x99\x99\x99\x99\x9a
@@ -1069,7 +1066,7 @@ test binary-30.9 {Tcl_BinaryObjCmd: scan
test binary-31.1 {Tcl_BinaryObjCmd: scan} {
list [catch {binary scan abc f} msg] $msg
} {1 {not enough arguments for all format specifiers}}
-test binary-31.2 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
+test binary-31.2 {Tcl_BinaryObjCmd: scan} {nonPortable unixOnly} {
catch {unset arg1}
list [binary scan \x3f\xcc\xcc\xcd\x40\x59\x99\x9a f* arg1] $arg1
} {1 {1.60000002384 3.40000009537}}
@@ -1077,7 +1074,7 @@ test binary-31.3 {Tcl_BinaryObjCmd: scan
catch {unset arg1}
list [binary scan \xcd\xcc\xcc\x3f\x9a\x99\x59\x40 f* arg1] $arg1
} {1 {1.60000002384 3.40000009537}}
-test binary-31.4 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
+test binary-31.4 {Tcl_BinaryObjCmd: scan} {nonPortable unixOnly} {
catch {unset arg1}
list [binary scan \x3f\xcc\xcc\xcd\x40\x59\x99\x9a f arg1] $arg1
} {1 1.60000002384}
@@ -1085,7 +1082,7 @@ test binary-31.5 {Tcl_BinaryObjCmd: scan
catch {unset arg1}
list [binary scan \xcd\xcc\xcc\x3f\x9a\x99\x59\x40 f arg1] $arg1
} {1 1.60000002384}
-test binary-31.6 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
+test binary-31.6 {Tcl_BinaryObjCmd: scan} {nonPortable unixOnly} {
catch {unset arg1}
list [binary scan \x3f\xcc\xcc\xcd f1 arg1] $arg1
} {1 1.60000002384}
@@ -1093,7 +1090,7 @@ test binary-31.7 {Tcl_BinaryObjCmd: scan
catch {unset arg1}
list [binary scan \xcd\xcc\xcc\x3f f1 arg1] $arg1
} {1 1.60000002384}
-test binary-31.8 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
+test binary-31.8 {Tcl_BinaryObjCmd: scan} {nonPortable unixOnly} {
catch {unset arg1}
list [binary scan \x3f\xcc\xcc\xcd f0 arg1] $arg1
} {1 {}}
@@ -1101,7 +1098,7 @@ test binary-31.9 {Tcl_BinaryObjCmd: scan
catch {unset arg1}
list [binary scan \xcd\xcc\xcc\x3f f0 arg1] $arg1
} {1 {}}
-test binary-31.10 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
+test binary-31.10 {Tcl_BinaryObjCmd: scan} {nonPortable unixOnly} {
catch {unset arg1}
list [binary scan \x3f\xcc\xcc\xcd\x40\x59\x99\x9a f2 arg1] $arg1
} {1 {1.60000002384 3.40000009537}}
@@ -1119,7 +1116,7 @@ test binary-31.13 {Tcl_BinaryObjCmd: sca
set arg1 1
list [catch {binary scan \x3f\xcc\xcc\xcd f1 arg1(a)} msg] $msg
} {1 {can't set "arg1(a)": variable isn't array}}
-test binary-31.14 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
+test binary-31.14 {Tcl_BinaryObjCmd: scan} {nonPortable unixOnly} {
catch {unset arg1 arg2}
set arg1 foo
set arg2 bar
@@ -1135,7 +1132,7 @@ test binary-31.15 {Tcl_BinaryObjCmd: sca
test binary-32.1 {Tcl_BinaryObjCmd: scan} {
list [catch {binary scan abc d} msg] $msg
} {1 {not enough arguments for all format specifiers}}
-test binary-32.2 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
+test binary-32.2 {Tcl_BinaryObjCmd: scan} {nonPortable unixOnly} {
catch {unset arg1}
list [binary scan \x3f\xf9\x99\x99\x99\x99\x99\x9a\x40\x0b\x33\x33\x33\x33\x33\x33 d* arg1] $arg1
} {1 {1.6 3.4}}
@@ -1143,7 +1140,7 @@ test binary-32.3 {Tcl_BinaryObjCmd: scan
catch {unset arg1}
list [binary scan \x9a\x99\x99\x99\x99\x99\xf9\x3f\x33\x33\x33\x33\x33\x33\x0b\x40 d* arg1] $arg1
} {1 {1.6 3.4}}
-test binary-32.4 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
+test binary-32.4 {Tcl_BinaryObjCmd: scan} {nonPortable unixOnly} {
catch {unset arg1}
list [binary scan \x3f\xf9\x99\x99\x99\x99\x99\x9a\x40\x0b\x33\x33\x33\x33\x33\x33 d arg1] $arg1
} {1 1.6}
@@ -1151,7 +1148,7 @@ test binary-32.5 {Tcl_BinaryObjCmd: scan
catch {unset arg1}
list [binary scan \x9a\x99\x99\x99\x99\x99\xf9\x3f\x33\x33\x33\x33\x33\x33\x0b\x40 d arg1] $arg1
} {1 1.6}
-test binary-32.6 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
+test binary-32.6 {Tcl_BinaryObjCmd: scan} {nonPortable unixOnly} {
catch {unset arg1}
list [binary scan \x3f\xf9\x99\x99\x99\x99\x99\x9a d1 arg1] $arg1
} {1 1.6}
@@ -1159,7 +1156,7 @@ test binary-32.7 {Tcl_BinaryObjCmd: scan
catch {unset arg1}
list [binary scan \x9a\x99\x99\x99\x99\x99\xf9\x3f d1 arg1] $arg1
} {1 1.6}
-test binary-32.8 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
+test binary-32.8 {Tcl_BinaryObjCmd: scan} {nonPortable unixOnly} {
catch {unset arg1}
list [binary scan \x3f\xf9\x99\x99\x99\x99\x99\x9a d0 arg1] $arg1
} {1 {}}
@@ -1167,7 +1164,7 @@ test binary-32.9 {Tcl_BinaryObjCmd: scan
catch {unset arg1}
list [binary scan \x9a\x99\x99\x99\x99\x99\xf9\x3f d0 arg1] $arg1
} {1 {}}
-test binary-32.10 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
+test binary-32.10 {Tcl_BinaryObjCmd: scan} {nonPortable unixOnly} {
catch {unset arg1}
list [binary scan \x3f\xf9\x99\x99\x99\x99\x99\x9a\x40\x0b\x33\x33\x33\x33\x33\x33 d2 arg1] $arg1
} {1 {1.6 3.4}}
@@ -1185,7 +1182,7 @@ test binary-32.13 {Tcl_BinaryObjCmd: sca
set arg1 1
list [catch {binary scan \x3f\xf9\x99\x99\x99\x99\x99\x9a d1 arg1(a)} msg] $msg
} {1 {can't set "arg1(a)": variable isn't array}}
-test binary-32.14 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
+test binary-32.14 {Tcl_BinaryObjCmd: scan} {nonPortable unixOnly} {
catch {unset arg1 arg2}
set arg1 foo
set arg2 bar
@@ -1351,13 +1348,13 @@ test binary-38.3 {FormatNumber: word ali
test binary-38.4 {FormatNumber: word alignment} {
set x [binary format c1I1 1 1]
} \x01\x00\x00\x00\x01
-test binary-38.5 {FormatNumber: word alignment} {nonPortable macOrUnix} {
+test binary-38.5 {FormatNumber: word alignment} {nonPortable unixOnly} {
set x [binary format c1d1 1 1.6]
} \x01\x3f\xf9\x99\x99\x99\x99\x99\x9a
test binary-38.6 {FormatNumber: word alignment} {nonPortable pcOnly} {
set x [binary format c1d1 1 1.6]
} \x01\x9a\x99\x99\x99\x99\x99\xf9\x3f
-test binary-38.7 {FormatNumber: word alignment} {nonPortable macOrUnix} {
+test binary-38.7 {FormatNumber: word alignment} {nonPortable unixOnly} {
set x [binary format c1f1 1 1.6]
} \x01\x3f\xcc\xcc\xcd
test binary-38.8 {FormatNumber: word alignment} {nonPortable pcOnly} {
@@ -1389,10 +1386,6 @@ test binary-40.1 {ScanNumber: floating p
catch {unset arg1}
list [binary scan \xff\xff\xff\xff f1 arg1] $arg1
} {1 -NaN}
-test binary-40.2 {ScanNumber: floating point overflow} {nonPortable macOnly} {
- catch {unset arg1}
- list [binary scan \xff\xff\xff\xff f1 arg1] $arg1
-} {1 -NAN(255)}
test binary-40.3 {ScanNumber: floating point overflow} {nonPortable pcOnly} {
catch {unset arg1}
set result [binary scan \xff\xff\xff\xff f1 arg1]
@@ -1407,10 +1400,6 @@ test binary-40.4 {ScanNumber: floating p
catch {unset arg1}
list [binary scan \xff\xff\xff\xff\xff\xff\xff\xff d1 arg1] $arg1
} {1 -NaN}
-test binary-40.5 {ScanNumber: floating point overflow} {nonPortable macOnly} {
- catch {unset arg1}
- list [binary scan \xff\xff\xff\xff\xff\xff\xff\xff d1 arg1] $arg1
-} {1 -NAN(255)}
test binary-40.6 {ScanNumber: floating point overflow} {nonPortable pcOnly} {
catch {unset arg1}
set result [binary scan \xff\xff\xff\xff\xff\xff\xff\xff d1 arg1]
@@ -1438,7 +1427,7 @@ test binary-41.4 {ScanNumber: word align
catch {unset arg1; unset arg2}
list [binary scan \x01\x00\x00\x00\x01 c1I1 arg1 arg2] $arg1 $arg2
} {2 1 1}
-test binary-41.5 {ScanNumber: word alignment} {nonPortable macOrUnix} {
+test binary-41.5 {ScanNumber: word alignment} {nonPortable unixOnly} {
catch {unset arg1; unset arg2}
list [binary scan \x01\x3f\xcc\xcc\xcd c1f1 arg1 arg2] $arg1 $arg2
} {2 1 1.60000002384}
@@ -1446,7 +1435,7 @@ test binary-41.6 {ScanNumber: word align
catch {unset arg1; unset arg2}
list [binary scan \x01\xcd\xcc\xcc\x3f c1f1 arg1 arg2] $arg1 $arg2
} {2 1 1.60000002384}
-test binary-41.7 {ScanNumber: word alignment} {nonPortable macOrUnix} {
+test binary-41.7 {ScanNumber: word alignment} {nonPortable unixOnly} {
catch {unset arg1; unset arg2}
list [binary scan \x01\x3f\xf9\x99\x99\x99\x99\x99\x9a c1d1 arg1 arg2] $arg1 $arg2
} {2 1 1.6}
Index: tests/cmdAH.test
===================================================================
RCS file: /cvsroot/tcl/tcl/tests/cmdAH.test,v
retrieving revision 1.37
diff -u -p -r1.37 cmdAH.test
--- tests/cmdAH.test 7 Oct 2003 21:45:38 -0000 1.37
+++ tests/cmdAH.test 17 Mar 2004 16:00:04 -0000
@@ -205,7 +205,7 @@ test cmdAH-6.2 {Tcl_FileObjCmd: volumes}
set result 1
}
} {1}
-test cmdAH-6.3 {Tcl_FileObjCmd: volumes} {macOrUnix} {
+test cmdAH-6.3 {Tcl_FileObjCmd: volumes} {unixOnly} {
set volumeList [file volumes]
catch [list glob -nocomplain [lindex $volumeList 0]*]
} {0}
@@ -248,10 +248,6 @@ test cmdAH-8.3 {Tcl_FileObjCmd: dirname}
testsetplatform unix
file dirname {}
} .
-test cmdAH-8.4 {Tcl_FileObjCmd: dirname} testsetplatform {
- testsetplatform mac
- file dirname {}
-} :
test cmdAH-8.5 {Tcl_FileObjCmd: dirname} testsetplatform {
testsetplatform win
file dirname {}
@@ -260,10 +256,6 @@ test cmdAH-8.6 {Tcl_FileObjCmd: dirname}
testsetplatform unix
file dirname .def
} .
-test cmdAH-8.7 {Tcl_FileObjCmd: dirname} testsetplatform {
- testsetplatform mac
- file dirname a
-} :
test cmdAH-8.8 {Tcl_FileObjCmd: dirname} testsetplatform {
testsetplatform win
file dirname a
@@ -340,50 +332,6 @@ test cmdAH-8.26 {Tcl_FileObjCmd: dirname
testsetplatform windows
list [catch {file dirname {//foo/bar}} msg] $msg
} {0 //foo/bar}
-test cmdAH-8.27 {Tcl_FileObjCmd: dirname} testsetplatform {
- testsetplatform mac
- list [catch {file dirname :} msg] $msg
-} {0 :}
-test cmdAH-8.28 {Tcl_FileObjCmd: dirname} testsetplatform {
- testsetplatform mac
- list [catch {file dirname :Foo} msg] $msg
-} {0 :}
-test cmdAH-8.29 {Tcl_FileObjCmd: dirname} testsetplatform {
- testsetplatform mac
- list [catch {file dirname Foo:} msg] $msg
-} {0 Foo:}
-test cmdAH-8.30 {Tcl_FileObjCmd: dirname} testsetplatform {
- testsetplatform mac
- list [catch {file dirname Foo:bar} msg] $msg
-} {0 Foo:}
-test cmdAH-8.31 {Tcl_FileObjCmd: dirname} testsetplatform {
- testsetplatform mac
- list [catch {file dirname :Foo:bar} msg] $msg
-} {0 :Foo}
-test cmdAH-8.32 {Tcl_FileObjCmd: dirname} testsetplatform {
- testsetplatform mac
- list [catch {file dirname ::} msg] $msg
-} {0 :}
-test cmdAH-8.33 {Tcl_FileObjCmd: dirname} testsetplatform {
- testsetplatform mac
- list [catch {file dirname :::} msg] $msg
-} {0 ::}
-test cmdAH-8.34 {Tcl_FileObjCmd: dirname} testsetplatform {
- testsetplatform mac
- list [catch {file dirname /foo/bar/} msg] $msg
-} {0 foo:}
-test cmdAH-8.35 {Tcl_FileObjCmd: dirname} testsetplatform {
- testsetplatform mac
- list [catch {file dirname /foo/bar} msg] $msg
-} {0 foo:}
-test cmdAH-8.36 {Tcl_FileObjCmd: dirname} testsetplatform {
- testsetplatform mac
- list [catch {file dirname /foo} msg] $msg
-} {0 foo:}
-test cmdAH-8.37 {Tcl_FileObjCmd: dirname} testsetplatform {
- testsetplatform mac
- list [catch {file dirname foo} msg] $msg
-} {0 :}
test cmdAH-8.38 {Tcl_FileObjCmd: dirname} testsetplatform {
testsetplatform unix
list [catch {file dirname ~/foo} msg] $msg
@@ -392,18 +340,6 @@ test cmdAH-8.39 {Tcl_FileObjCmd: dirname
testsetplatform unix
list [catch {file dirname ~bar/foo} msg] $msg
} {0 ~bar}
-test cmdAH-8.40 {Tcl_FileObjCmd: dirname} testsetplatform {
- testsetplatform mac
- list [catch {file dirname ~bar/foo} msg] $msg
-} {0 ~bar:}
-test cmdAH-8.41 {Tcl_FileObjCmd: dirname} testsetplatform {
- testsetplatform mac
- list [catch {file dirname ~/foo} msg] $msg
-} {0 ~:}
-test cmdAH-8.42 {Tcl_FileObjCmd: dirname} testsetplatform {
- testsetplatform mac
- list [catch {file dirname ~:baz} msg] $msg
-} {0 ~:}
test cmdAH-8.43 {Tcl_FileObjCmd: dirname} testsetplatform {
global env
set temp $env(HOME)
@@ -431,15 +367,6 @@ test cmdAH-8.45 {Tcl_FileObjCmd: dirname
set env(HOME) $temp
set result
} {0 /homewontexist}
-test cmdAH-8.46 {Tcl_FileObjCmd: dirname} testsetplatform {
- global env
- set temp $env(HOME)
- set env(HOME) "/home/test"
- testsetplatform mac
- set result [list [catch {file dirname ~} msg] $msg]
- set env(HOME) $temp
- set result
-} {0 home:}
# tail
@@ -455,10 +382,6 @@ test cmdAH-9.3 {Tcl_FileObjCmd: tail} te
testsetplatform unix
file tail {}
} {}
-test cmdAH-9.4 {Tcl_FileObjCmd: tail} testsetplatform {
- testsetplatform mac
- file tail {}
-} {}
test cmdAH-9.5 {Tcl_FileObjCmd: tail} testsetplatform {
testsetplatform win
file tail {}
@@ -467,10 +390,6 @@ test cmdAH-9.6 {Tcl_FileObjCmd: tail} te
testsetplatform unix
file tail .def
} .def
-test cmdAH-9.7 {Tcl_FileObjCmd: tail} testsetplatform {
- testsetplatform mac
- file tail a
-} a
test cmdAH-9.8 {Tcl_FileObjCmd: tail} testsetplatform {
testsetplatform win
file tail a
@@ -547,66 +466,6 @@ test cmdAH-9.26 {Tcl_FileObjCmd: tail} t
testsetplatform windows
file tail {//foo/bar}
} {}
-test cmdAH-9.27 {Tcl_FileObjCmd: tail} testsetplatform {
- testsetplatform mac
- file tail :
-} :
-test cmdAH-9.28 {Tcl_FileObjCmd: tail} testsetplatform {
- testsetplatform mac
- file tail :Foo
-} Foo
-test cmdAH-9.29 {Tcl_FileObjCmd: tail} testsetplatform {
- testsetplatform mac
- file tail Foo:
-} {}
-test cmdAH-9.30 {Tcl_FileObjCmd: tail} testsetplatform {
- testsetplatform mac
- file tail Foo:bar
-} bar
-test cmdAH-9.31 {Tcl_FileObjCmd: tail} testsetplatform {
- testsetplatform mac
- file tail :Foo:bar
-} bar
-test cmdAH-9.32 {Tcl_FileObjCmd: tail} testsetplatform {
- testsetplatform mac
- file tail ::
-} ::
-test cmdAH-9.33 {Tcl_FileObjCmd: tail} testsetplatform {
- testsetplatform mac
- file tail :::
-} ::
-test cmdAH-9.34 {Tcl_FileObjCmd: tail} testsetplatform {
- testsetplatform mac
- file tail /foo/bar/
-} bar
-test cmdAH-9.35 {Tcl_FileObjCmd: tail} testsetplatform {
- testsetplatform mac
- file tail /foo/bar
-} bar
-test cmdAH-9.36 {Tcl_FileObjCmd: tail} testsetplatform {
- testsetplatform mac
- file tail /foo
-} {}
-test cmdAH-9.37 {Tcl_FileObjCmd: tail} testsetplatform {
- testsetplatform mac
- file tail foo
-} foo
-test cmdAH-9.38 {Tcl_FileObjCmd: tail} testsetplatform {
- testsetplatform mac
- file tail ~:foo
-} foo
-test cmdAH-9.39 {Tcl_FileObjCmd: tail} testsetplatform {
- testsetplatform mac
- file tail ~bar:foo
-} foo
-test cmdAH-9.40 {Tcl_FileObjCmd: tail} testsetplatform {
- testsetplatform mac
- file tail ~bar/foo
-} foo
-test cmdAH-9.41 {Tcl_FileObjCmd: tail} testsetplatform {
- testsetplatform mac
- file tail ~/foo
-} foo
test cmdAH-9.42 {Tcl_FileObjCmd: tail} testsetplatform {
global env
set temp $env(HOME)
@@ -634,15 +493,6 @@ test cmdAH-9.44 {Tcl_FileObjCmd: tail} t
set env(HOME) $temp
set result
} test
-test cmdAH-9.45 {Tcl_FileObjCmd: tail} testsetplatform {
- global env
- set temp $env(HOME)
- set env(HOME) "/home/test"
- testsetplatform mac
- set result [file tail ~]
- set env(HOME) $temp
- set result
-} test
test cmdAH-9.46 {Tcl_FileObjCmd: tail} testsetplatform {
testsetplatform unix
file tail {f.oo\bar/baz.bat}
@@ -710,54 +560,6 @@ test cmdAH-10.10 {Tcl_FileObjCmd: rootna
testsetplatform unix
file rootname a/b.c/
} a/b.c/
-test cmdAH-10.11 {Tcl_FileObjCmd: rootname} testsetplatform {
- testsetplatform mac
- file ro foo
-} foo
-test cmdAH-10.12 {Tcl_FileObjCmd: rootname} testsetplatform {
- testsetplatform mac
- file rootname {}
-} {}
-test cmdAH-10.13 {Tcl_FileObjCmd: rootname} testsetplatform {
- testsetplatform mac
- file rootname foo.
-} foo
-test cmdAH-10.14 {Tcl_FileObjCmd: rootname} testsetplatform {
- testsetplatform mac
- file rootname .foo
-} {}
-test cmdAH-10.15 {Tcl_FileObjCmd: rootname} testsetplatform {
- testsetplatform mac
- file rootname abc.def
-} abc
-test cmdAH-10.16 {Tcl_FileObjCmd: rootname} testsetplatform {
- testsetplatform mac
- file rootname abc.def.ghi
-} abc.def
-test cmdAH-10.17 {Tcl_FileObjCmd: rootname} testsetplatform {
- testsetplatform mac
- file rootname a:b:c.d
-} a:b:c
-test cmdAH-10.18 {Tcl_FileObjCmd: rootname} testsetplatform {
- testsetplatform mac
- file rootname a:b.c:d
-} a:b.c:d
-test cmdAH-10.19 {Tcl_FileObjCmd: rootname} testsetplatform {
- testsetplatform mac
- file rootname a/b/c.d
-} a/b/c
-test cmdAH-10.20 {Tcl_FileObjCmd: rootname} testsetplatform {
- testsetplatform mac
- file rootname a/b.c/d
-} a/b.c/d
-test cmdAH-10.21 {Tcl_FileObjCmd: rootname} testsetplatform {
- testsetplatform mac
- file rootname /a.b
-} /a
-test cmdAH-10.22 {Tcl_FileObjCmd: rootname} testsetplatform {
- testsetplatform mac
- file rootname foo.c:
-} foo.c:
test cmdAH-10.23 {Tcl_FileObjCmd: rootname} testsetplatform {
testsetplatform windows
file rootname {}
@@ -860,54 +662,6 @@ test cmdAH-11.10 {Tcl_FileObjCmd: extens
testsetplatform unix
file extension a/b.c/
} {}
-test cmdAH-11.11 {Tcl_FileObjCmd: extension} testsetplatform {
- testsetplatform mac
- file ext foo
-} {}
-test cmdAH-11.12 {Tcl_FileObjCmd: extension} testsetplatform {
- testsetplatform mac
- file extension {}
-} {}
-test cmdAH-11.13 {Tcl_FileObjCmd: extension} testsetplatform {
- testsetplatform mac
- file extension foo.
-} .
-test cmdAH-11.14 {Tcl_FileObjCmd: extension} testsetplatform {
- testsetplatform mac
- file extension .foo
-} .foo
-test cmdAH-11.15 {Tcl_FileObjCmd: extension} testsetplatform {
- testsetplatform mac
- file extension abc.def
-} .def
-test cmdAH-11.16 {Tcl_FileObjCmd: extension} testsetplatform {
- testsetplatform mac
- file extension abc.def.ghi
-} .ghi
-test cmdAH-11.17 {Tcl_FileObjCmd: extension} testsetplatform {
- testsetplatform mac
- file extension a:b:c.d
-} .d
-test cmdAH-11.18 {Tcl_FileObjCmd: extension} testsetplatform {
- testsetplatform mac
- file extension a:b.c:d
-} {}
-test cmdAH-11.19 {Tcl_FileObjCmd: extension} testsetplatform {
- testsetplatform mac
- file extension a/b/c.d
-} .d
-test cmdAH-11.20 {Tcl_FileObjCmd: extension} testsetplatform {
- testsetplatform mac
- file extension a/b.c/d
-} {}
-test cmdAH-11.21 {Tcl_FileObjCmd: extension} testsetplatform {
- testsetplatform mac
- file extension /a.b
-} .b
-test cmdAH-11.22 {Tcl_FileObjCmd: extension} testsetplatform {
- testsetplatform mac
- file extension foo.c:
-} {}
test cmdAH-11.23 {Tcl_FileObjCmd: extension} testsetplatform {
testsetplatform windows
file extension {}
@@ -958,7 +712,7 @@ test cmdAH-11.34 {Tcl_FileObjCmd: extens
} {}
set num 35
foreach value {a..b a...b a.c..b ..b} result {.b .b .b .b} {
- foreach p {unix mac windows} {
+ foreach p {unix windows} {
; test cmdAH-11.$num {Tcl_FileObjCmd: extension} testsetplatform "
testsetplatform $p
file extension $value
@@ -1088,13 +842,6 @@ test cmdAH-18.3 {Tcl_FileObjCmd: executa
file exe $gorpfile
} 1
-test cmdAH-18.4 {Tcl_FileObjCmd: executable} {macOnly testchmod} {
- # On mac, the only executable files are of type APPL.
-
- set x [file exe $gorpfile]
- file attrib $gorpfile -type APPL
- lappend x [file exe $gorpfile]
-} {0 1}
test cmdAH-18.5 {Tcl_FileObjCmd: executable} {winOnly testchmod} {
# On pc, must be a .exe, .com, etc.
@@ -1145,10 +892,6 @@ test cmdAH-19.7 {Tcl_FileObjCmd: nativen
testsetplatform windows
list [catch {file nativename a/b} msg] $msg [testsetplatform $platform]
} {0 {a\b} {}}
-test cmdAH-19.8 {Tcl_FileObjCmd: nativename} testsetplatform {
- testsetplatform mac
- list [catch {file nativename a/b} msg] $msg [testsetplatform $platform]
-} {0 :a:b {}}
test cmdAH-19.9 {Tcl_FileObjCmd: ~ : exists} {
file exists ~nOsUcHuSeR
@@ -1409,14 +1152,14 @@ test cmdAH-24.5 {Tcl_FileObjCmd: mtime}
test cmdAH-24.7 {Tcl_FileObjCmd: mtime} {
list [catch {file mtime $file notint} msg] $msg
} {1 {expected integer but got "notint"}}
-test cmdAH-24.8 {Tcl_FileObjCmd: mtime touch} macOrUnix {
+test cmdAH-24.8 {Tcl_FileObjCmd: mtime touch} unixOnly {
set mtime [file mtime $file]
after 1100; # pause a sec to notice change in mtime
set newmtime [clock seconds]
set modmtime [file mtime $file $newmtime]
expr {$newmtime == $modmtime ? 1 : "$newmtime != $modmtime"}
} 1
-test cmdAH-24.9 {Tcl_FileObjCmd: mtime touch with non-ascii chars} macOrUnix {
+test cmdAH-24.9 {Tcl_FileObjCmd: mtime touch with non-ascii chars} unixOnly {
set oldfile $file
# introduce some non-ascii characters.
append file \u2022
@@ -1492,10 +1235,6 @@ test cmdAH-26.3 {Tcl_FileObjCmd: readlin
list [catch {file readlink _bogus_} msg] [string tolower $msg] \
[string tolower $errorCode]
} {1 {could not readlink "_bogus_": no such file or directory} {posix enoent {no such file or directory}}}
-test cmdAH-26.4 {Tcl_FileObjCmd: readlink errors} {macOnly nonPortable} {
- list [catch {file readlink _bogus_} msg] [string tolower $msg] \
- [string tolower $errorCode]
-} {1 {could not readlink "_bogus_": no such file or directory} {posix enoent {no such file or directory}}}
test cmdAH-26.5 {Tcl_FileObjCmd: readlink errors} {winOnly nonPortable} {
list [catch {file readlink _bogus_} msg] [string tolower $msg] \
[string tolower $errorCode]
Index: tests/cmdMZ.test
===================================================================
RCS file: /cvsroot/tcl/tcl/tests/cmdMZ.test,v
retrieving revision 1.20
diff -u -p -r1.20 cmdMZ.test
--- tests/cmdMZ.test 25 Feb 2004 23:56:59 -0000 1.20
+++ tests/cmdMZ.test 17 Mar 2004 16:00:04 -0000
@@ -187,12 +187,6 @@ foreach script {
# Tcl_SourceObjCmd
# More tests of Tcl_SourceObjCmd are in source.test
-test cmdMZ-3.1 {Tcl_SourceObjCmd: error conditions} {macOnly} {
- list [catch {source} msg] $msg
-} {1 {wrong # args: should be "source fileName" or "source -rsrc name ?fileName?" or "source -rsrcid id ?fileName?"}}
-test cmdMZ-3.2 {Tcl_SourceObjCmd: error conditions} {macOnly} {
- list [catch {source a b} msg] $msg
-} {1 {bad argument: should be "source fileName" or "source -rsrc name ?fileName?" or "source -rsrcid id ?fileName?"}}
test cmdMZ-3.3 {Tcl_SourceObjCmd: error conditions} -constraints {
unixOrPc
} -body {
Index: tests/fCmd.test
===================================================================
RCS file: /cvsroot/tcl/tcl/tests/fCmd.test,v
retrieving revision 1.37
diff -u -p -r1.37 fCmd.test
--- tests/fCmd.test 26 Jan 2004 13:33:59 -0000 1.37
+++ tests/fCmd.test 17 Mar 2004 16:00:04 -0000
@@ -69,11 +69,7 @@ proc openup {path} {
}
proc cleanup {args} {
- if {$::tcl_platform(platform) == "macintosh"} {
- set wd [list :]
- } else {
- set wd [list .]
- }
+ set wd [list .]
foreach p [concat $wd $args] {
set x ""
catch {
@@ -99,16 +95,6 @@ cd [temporaryDirectory]
set ::tcltest::testConstraints(fileSharing) 0
set ::tcltest::testConstraints(notFileSharing) 1
-if {$tcl_platform(platform) == "macintosh"} {
- catch {file delete -force foo.dir}
- file mkdir foo.dir
- if {[catch {file attributes foo.dir -readonly 1}] == 0} {
- set ::tcltest::testConstraints(fileSharing) 1
- set ::tcltest::testConstraints(notFileSharing) 0
- }
- file delete -force foo.dir
-}
-
set ::tcltest::testConstraints(xdev) 0
if {$tcl_platform(platform) == "unix"} {
@@ -300,10 +286,6 @@ test fCmd-4.11 {TclFileMakeDirsCmd: does
testchmod 755 td1/td2
set msg
} {1 {can't create directory "td1/td2/td3": permission denied}}
-test fCmd-4.12 {TclFileMakeDirsCmd: doesn't exist: errno != ENOENT} {macOnly} {
- cleanup
- list [catch {file mkdir nonexistentvolume:} msg] $msg
-} {1 {can't create directory "nonexistentvolume:": invalid argument}}
test fCmd-4.13 {TclFileMakeDirsCmd: doesn't exist: errno == ENOENT} {notRoot} {
cleanup
set x [file exists td1]
@@ -320,9 +302,6 @@ test fCmd-4.14 {TclFileMakeDirsCmd: Tclp
file delete -force foo
set result
} {1 {can't create directory "foo/tf1": permission denied}}
-test fCmd-4.15 {TclFileMakeDirsCmd: TclpCreateDirectory fails} {macOnly} {
- list [catch {file mkdir ${root}:} msg] $msg
-} [subst {1 {can't create directory "${root}:": no such file or directory}}]
test fCmd-4.16 {TclFileMakeDirsCmd: TclpCreateDirectory succeeds} {notRoot} {
cleanup
file mkdir tf1
@@ -439,11 +418,6 @@ test fCmd-6.7 {CopyRenameOneFile: errno
createfile tf1
list [catch {file rename tf1 $long} msg] $msg
} [subst {1 {error renaming "tf1" to "$long": file name too long}}]
-test fCmd-6.8 {CopyRenameOneFile: errno != ENOENT} {macOnly} {
- cleanup
- createfile tf1
- list [catch {file rename tf1 $long} msg] $msg
-} [subst {1 {error renaming "tf1" to "$long": file name too long}}]
test fCmd-6.9 {CopyRenameOneFile: errno == ENOENT} {unixOnly notRoot} {
cleanup
createfile tf1
@@ -767,20 +741,18 @@ test fCmd-9.8 {file rename: comprehensiv
file mkdir [file join tdd2 tds2]
file mkdir [file join tdd3 tds3]
file mkdir [file join tdd4 tds4]
- if {$tcl_platform(platform) != "unix" && $tcl_platform(platform) != "macintosh"} {
+ if {$tcl_platform(platform) != "unix"} {
testchmod 555 tds3
testchmod 555 tds4
}
- if {$tcl_platform(platform) != "macintosh"} {
- testchmod 555 [file join tdd2 tds2]
- testchmod 555 [file join tdd4 tds4]
- }
+ testchmod 555 [file join tdd2 tds2]
+ testchmod 555 [file join tdd4 tds4]
set msg [list [catch {file rename td1 td2} msg] $msg]
file rename -force tds1 tdd1
file rename -force tds2 tdd2
file rename -force tds3 tdd3
file rename -force tds4 tdd4
- if {$tcl_platform(platform) != "unix" && $tcl_platform(platform) != "macintosh"} {
+ if {$tcl_platform(platform) != "unix"} {
set w3 [file writable [file join tdd3 tds3]]
set w4 [file writable [file join tdd4 tds4]]
} else {
@@ -796,12 +768,12 @@ test fCmd-9.9 {file rename: comprehensiv
file mkdir tds2
file mkdir [file join tdd1 tds1 xxx]
file mkdir [file join tdd2 tds2 xxx]
- if {$tcl_platform(platform) != "unix" && $tcl_platform(platform) != "macintosh"} {
+ if {$tcl_platform(platform) != "unix"} {
testchmod 555 tds2
}
set a1 [list [catch {file rename -force tds1 tdd1} msg] $msg]
set a2 [list [catch {file rename -force tds2 tdd2} msg] $msg]
- if {$tcl_platform(platform) != "unix" && $tcl_platform(platform) != "macintosh"} {
+ if {$tcl_platform(platform) != "unix"} {
set w2 [file writable tds2]
} else {
set w2 0
@@ -824,12 +796,12 @@ test fCmd-9.11 {file rename: comprehensi
file mkdir td1
file mkdir td2
file mkdir td3
- if {$tcl_platform(platform) != "unix" && $tcl_platform(platform) != "macintosh"} {
+ if {$tcl_platform(platform) != "unix"} {
testchmod 555 td2
}
file rename td1 [file join td3 td3]
file rename td2 [file join td3 td4]
- if {$tcl_platform(platform) != "unix" && $tcl_platform(platform) != "macintosh"} {
+ if {$tcl_platform(platform) != "unix"} {
set w4 [file writable [file join td3 td4]]
} else {
set w4 0
@@ -840,16 +812,12 @@ test fCmd-9.11 {file rename: comprehensi
test fCmd-9.12 {file rename: comprehensive: target exists} {notRoot testchmod} {
cleanup
file mkdir [file join td1 td2] [file join td2 td1]
- if {$tcl_platform(platform) != "macintosh"} {
- testchmod 555 [file join td2 td1]
- }
+ testchmod 555 [file join td2 td1]
file mkdir [file join td3 td4] [file join td4 td3]
file rename -force td3 td4
set msg [list [file exists td3] [file exists [file join td4 td3 td4]] \
[catch {file rename td1 td2} msg] $msg]
- if {$tcl_platform(platform) != "macintosh"} {
- testchmod 755 [file join td2 td1]
- }
+ testchmod 755 [file join td2 td1]
set msg
} [subst {0 1 1 {error renaming "td1" to "[file join td2 td1]": file already exists}}]
test fCmd-9.13 {file rename: comprehensive: can't overwrite target} {notRoot} {
@@ -924,10 +892,8 @@ test fCmd-10.3 {file copy: comprehensive
file copy td2 td4
set msg [list [lsort [glob td*]] [glob -directory td3 t*] \
[glob -directory td4 t*] [file writable td3] [file writable td4]]
- if {$tcl_platform(platform) != "macintosh"} {
- testchmod 755 td2
- testchmod 755 td4
- }
+ testchmod 755 td2
+ testchmod 755 td4
set msg
} [subst {{td1 td2 td3 td4} [file join td3 tdx] [file join td4 tdy] 1 0}]
test fCmd-10.4 {file copy: comprehensive: file to existing file} {notRoot testchmod} {
@@ -965,12 +931,10 @@ test fCmd-10.5 {file copy: comprehensive
file mkdir [file join tdd2 tds2]
file mkdir [file join tdd3 tds3]
file mkdir [file join tdd4 tds4]
- if {$tcl_platform(platform) != "macintosh"} {
- testchmod 555 tds3
- testchmod 555 tds4
- testchmod 555 [file join tdd2 tds2]
- testchmod 555 [file join tdd4 tds4]
- }
+ testchmod 555 tds3
+ testchmod 555 tds4
+ testchmod 555 [file join tdd2 tds2]
+ testchmod 555 [file join tdd4 tds4]
set a1 [list [catch {file copy td1 td2} msg] $msg]
set a2 [list [catch {file copy -force tds1 tdd1} msg] $msg]
set a3 [catch {file copy -force tds2 tdd2}]
@@ -1678,7 +1642,7 @@ test fCmd-18.5 {TclFileRenameCmd: attemp
#
# On Windows there is no easy way to determine if two files are the same
#
-test fCmd-18.6 {TclFileRenameCmd: rename a file to itself} {macOrUnix notRoot} {
+test fCmd-18.6 {TclFileRenameCmd: rename a file to itself} {unixOnly notRoot} {
catch {file delete -force -- tfa}
set s [createfile tfa]
set r1 [catch {file rename tfa tfa}]
@@ -2020,7 +1984,7 @@ test fCmd-22.1 {TclpRenameFile: rename a
set result
} {1}
-test fCmd-22.2 {TclpRenameFile: attempt to overwrite itself} {macOrUnix notRoot} {
+test fCmd-22.2 {TclpRenameFile: attempt to overwrite itself} {unixOnly notRoot} {
catch {file delete -force -- tfa1}
set s [createfile tfa1]
file rename -force tfa1 tfa1
@@ -2267,7 +2231,7 @@ test fCmd-28.5 {file link: source alread
set res
} {1 {could not create new link "abc.dir": that path already exists}}
-test fCmd-28.6 {file link: unsupported operation} {linkDirectory macOrWin} {
+test fCmd-28.6 {file link: unsupported operation} {linkDirectory winOnly} {
cd [temporaryDirectory]
set res [list [catch {file link -hard abc.link abc.dir} msg] $msg]
cd [workingDirectory]
Index: tests/fileName.test
===================================================================
RCS file: /cvsroot/tcl/tcl/tests/fileName.test,v
retrieving revision 1.37
diff -u -p -r1.37 fileName.test
--- tests/fileName.test 9 Mar 2004 12:54:02 -0000 1.37
+++ tests/fileName.test 17 Mar 2004 16:00:04 -0000
@@ -66,115 +66,6 @@ test filename-1.8 {Tcl_GetPathType: unix
file pathtype ./~foo
} relative
-test filename-2.1 {Tcl_GetPathType: mac, denerate names} {testsetplatform} {
- testsetplatform mac
- file pathtype /
-} relative
-test filename-2.2 {Tcl_GetPathType: mac, denerate names} {testsetplatform} {
- testsetplatform mac
- file pathtype /.
-} relative
-test filename-2.3 {Tcl_GetPathType: mac, denerate names} {testsetplatform} {
- testsetplatform mac
- file pathtype /..
-} relative
-test filename-2.4 {Tcl_GetPathType: mac, denerate names} {testsetplatform} {
- testsetplatform mac
- file pathtype //.//
-} relative
-test filename-2.5 {Tcl_GetPathType: mac, denerate names} {testsetplatform} {
- testsetplatform mac
- file pathtype //.//../.
-} relative
-test filename-2.6 {Tcl_GetPathType: mac, tilde names} {testsetplatform} {
- testsetplatform mac
- file pathtype ~
-} absolute
-test filename-2.7 {Tcl_GetPathType: mac, tilde names} {testsetplatform} {
- testsetplatform mac
- file pathtype ~:
-} absolute
-test filename-2.8 {Tcl_GetPathType: mac, tilde names} {testsetplatform} {
- testsetplatform mac
- file pathtype ~:foo
-} absolute
-test filename-2.9 {Tcl_GetPathType: mac, tilde names} {testsetplatform} {
- testsetplatform mac
- file pathtype ~/
-} absolute
-test filename-2.10 {Tcl_GetPathType: mac, tilde names} {testsetplatform} {
- testsetplatform mac
- file pathtype ~/foo
-} absolute
-test filename-2.11 {Tcl_GetPathType: mac, unix-style names} {testsetplatform} {
- testsetplatform mac
- file pathtype /foo
-} absolute
-test filename-2.12 {Tcl_GetPathType: mac, unix-style names} {testsetplatform} {
- testsetplatform mac
- file pathtype /./foo
-} absolute
-test filename-2.13 {Tcl_GetPathType: mac, unix-style names} {testsetplatform} {
- testsetplatform mac
- file pathtype /..//./foo
-} absolute
-test filename-2.14 {Tcl_GetPathType: mac, unix-style names} {testsetplatform} {
- testsetplatform mac
- file pathtype /foo/bar
-} absolute
-test filename-2.15 {Tcl_GetPathType: mac, unix-style names} {testsetplatform} {
- testsetplatform mac
- file pathtype foo/bar
-} relative
-test filename-2.16 {Tcl_GetPathType: mac, mac-style names} {testsetplatform} {
- testsetplatform mac
- file pathtype :
-} relative
-test filename-2.17 {Tcl_GetPathType: mac, mac-style names} {testsetplatform} {
- testsetplatform mac
- file pathtype :foo
-} relative
-test filename-2.18 {Tcl_GetPathType: mac, mac-style names} {testsetplatform} {
- testsetplatform mac
- file pathtype foo:
-} absolute
-test filename-2.19 {Tcl_GetPathType: mac, mac-style names} {testsetplatform} {
- testsetplatform mac
- file pathtype foo:bar
-} absolute
-test filename-2.20 {Tcl_GetPathType: mac, mac-style names} {testsetplatform} {
- testsetplatform mac
- file pathtype :foo:bar
-} relative
-test filename-2.21 {Tcl_GetPathType: mac, mac-style names} {testsetplatform} {
- testsetplatform mac
- file pathtype ::foo:bar
-} relative
-test filename-2.22 {Tcl_GetPathType: mac, mac-style names} {testsetplatform} {
- testsetplatform mac
- file pathtype ~foo
-} absolute
-test filename-2.23 {Tcl_GetPathType: mac, mac-style names} {testsetplatform} {
- testsetplatform mac
- file pathtype :~foo
-} relative
-test filename-2.24 {Tcl_GetPathType: mac, mac-style names} {testsetplatform} {
- testsetplatform mac
- file pathtype ~foo:
-} absolute
-test filename-2.25 {Tcl_GetPathType: mac, mac-style names} {testsetplatform} {
- testsetplatform mac
- file pathtype foo/bar:
-} absolute
-test filename-2.26 {Tcl_GetPathType: mac, mac-style names} {testsetplatform} {
- testsetplatform mac
- file pathtype /foo:
-} absolute
-test filename-2.27 {Tcl_GetPathType: mac, mac-style names} {testsetplatform} {
- testsetplatform mac
- file pathtype foo
-} relative
-
test filename-3.1 {Tcl_GetPathType: windows} {testsetplatform} {
testsetplatform windows
file pathtype /
@@ -343,211 +234,6 @@ test filename-4.19 {Tcl_SplitPath} {
list $res $err
} {0 tildetmp/~tilde}
-test filename-5.1 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split a:b
-} {a: b}
-test filename-5.2 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split a:b:c
-} {a: b c}
-test filename-5.3 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split a:b:c:
-} {a: b c}
-test filename-5.4 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split a:
-} {a:}
-test filename-5.5 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split a::
-} {a: ::}
-test filename-5.6 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split a:::
-} {a: :: ::}
-test filename-5.7 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split :a
-} {a}
-test filename-5.8 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split :a::
-} {a ::}
-test filename-5.9 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split :
-} {:}
-test filename-5.10 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split ::
-} {::}
-test filename-5.11 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split :::
-} {:: ::}
-test filename-5.12 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split a:::b
-} {a: :: :: b}
-test filename-5.13 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split /a:b
-} {/a: b}
-test filename-5.14 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split ~:
-} {~:}
-test filename-5.15 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split ~/:
-} {~/:}
-test filename-5.16 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split ~:foo
-} {~: foo}
-test filename-5.17 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split ~/foo
-} {~: foo}
-test filename-5.18 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split ~foo:
-} {~foo:}
-test filename-5.19 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split a:~foo
-} {a: :~foo}
-test filename-5.20 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split /
-} {:/}
-test filename-5.21 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split a:b/c
-} {a: :b/c}
-test filename-5.22 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split /foo
-} {foo:}
-test filename-5.23 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split /a/b
-} {a: b}
-test filename-5.24 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split /a/b/foo
-} {a: b foo}
-test filename-5.25 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split a/b
-} {a b}
-test filename-5.26 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split ./foo/bar
-} {: foo bar}
-test filename-5.27 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split ../foo/bar
-} {:: foo bar}
-test filename-5.28 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split {}
-} {}
-test filename-5.29 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split .
-} {:}
-test filename-5.30 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split ././
-} {: :}
-test filename-5.31 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split ././.
-} {: : :}
-test filename-5.32 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split ../
-} {::}
-test filename-5.33 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split ..
-} {::}
-test filename-5.34 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split ../..
-} {:: ::}
-test filename-5.35 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split //foo
-} {foo:}
-test filename-5.36 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split foo//bar
-} {foo bar}
-test filename-5.37 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split ~foo
-} {~foo:}
-test filename-5.38 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split ~
-} {~:}
-test filename-5.39 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split foo
-} {foo}
-test filename-5.40 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split ~/
-} {~:}
-test filename-5.41 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split ~foo/~bar
-} {~foo: :~bar}
-test filename-5.42 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split ~foo/~bar/~baz
-} {~foo: :~bar :~baz}
-test filename-5.43 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split foo/bar~/baz
-} {foo bar~ baz}
-test filename-5.44 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split a/../b
-} {a :: b}
-test filename-5.45 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split a/../../b
-} {a :: :: b}
-test filename-5.46 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split a/.././../b
-} {a :: : :: b}
-test filename-5.47 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split /../bar
-} {bar:}
-test filename-5.48 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split /./bar
-} {bar:}
-test filename-5.49 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split //.//.././bar
-} {bar:}
-test filename-5.50 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split /..
-} {:/..}
-test filename-5.51 {Tcl_SplitPath: mac} {testsetplatform} {
- testsetplatform mac
- file split //.//.././
-} {://.//.././}
-
test filename-6.1 {Tcl_SplitPath: win} {testsetplatform} {
testsetplatform win
file split /
@@ -742,94 +428,6 @@ test filename-7.18 {Tcl_JoinPath: unix}
file join /// a b
} {/a/b}
-test filename-8.1 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join a b
-} {:a:b}
-test filename-8.2 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join :a b
-} {:a:b}
-test filename-8.3 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join a b:
-} {b:}
-test filename-8.4 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join a: :b
-} {a:b}
-test filename-8.5 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join a: :b:
-} {a:b}
-test filename-8.6 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join a :: b
-} {:a::b}
-test filename-8.7 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join a :: :: b
-} {:a:::b}
-test filename-8.8 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join a ::: b
-} {:a:::b}
-test filename-8.9 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join a: b:
-} {b:}
-test filename-8.10 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join /a/b
-} {a:b}
-test filename-8.11 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join /a/b c/d
-} {a:b:c:d}
-test filename-8.12 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join /a/b :c:d
-} {a:b:c:d}
-test filename-8.13 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join ~ foo
-} {~:foo}
-test filename-8.14 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join :: ::
-} {:::}
-test filename-8.15 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join a: ::
-} {a::}
-test filename-8.16 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join a {} b
-} {:a:b}
-test filename-8.17 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join a::: b
-} {a:::b}
-test filename-8.18 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join a : : :
-} {:a}
-test filename-8.19 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join :
-} {:}
-test filename-8.20 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join : a
-} {:a}
-test filename-8.21 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join a: :b/c
-} {a:b/c}
-test filename-8.22 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- file join :a :b/c
-} {:a:b/c}
test filename-9.1 {Tcl_JoinPath: win} {testsetplatform} {
testsetplatform win
@@ -940,22 +538,6 @@ test filename-9.20 {Tcl_JoinPath: unix}
[file join /x {/foo/bar}] \
[file join /x /x {/foo/bar}]
} {/foo/bar /foo/bar /foo/bar}
-test filename-9.21 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- set res {}
- lappend res \
- [file join {/foo/bar}] \
- [file join drive: {/foo/bar}] \
- [file join drive: drive: {/foo/bar}]
-} {foo:bar foo:bar foo:bar}
-test filename-9.22 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- set res {}
- lappend res \
- [file join {foo:bar}] \
- [file join drive: {foo:bar}] \
- [file join drive: drive: {foo:bar}]
-} {foo:bar foo:bar foo:bar}
test filename-9.23 {Tcl_JoinPath: win} {testsetplatform} {
testsetplatform win
set res {}
@@ -974,24 +556,6 @@ test filename-9.24 {Tcl_JoinPath: unix}
[file join /x /x {foo/bar}]
string map [list /x ""] $res
} {foo/bar /foo/bar /foo/bar}
-test filename-9.25 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- set res {}
- lappend res \
- [file join {foo/bar}] \
- [file join drive: {foo/bar}] \
- [file join drive: drive: {foo/bar}]
- string map [list drive: ""] $res
-} {:foo:bar foo:bar foo:bar}
-test filename-9.26 {Tcl_JoinPath: mac} {testsetplatform} {
- testsetplatform mac
- set res {}
- lappend res \
- [file join {:foo:bar}] \
- [file join drive: {:foo:bar}] \
- [file join drive: drive: {:foo:bar}]
- string map [list drive: ""] $res
-} {:foo:bar foo:bar foo:bar}
test filename-10.1 {Tcl_TranslateFileName} {testsetplatform} {
testsetplatform unix
@@ -1009,14 +573,6 @@ test filename-10.3.1 {Tcl_TranslateFileN
testsetplatform windows
list [catch {testtranslatefilename {c://///}} msg] $msg
} {0 c:\\}
-test filename-10.4 {Tcl_TranslateFileName} {testsetplatform} {
- testsetplatform mac
- list [catch {testtranslatefilename foo} msg] $msg
-} {0 :foo}
-test filename-10.5 {Tcl_TranslateFileName} {testsetplatform} {
- testsetplatform mac
- list [catch {testtranslatefilename :~foo} msg] $msg
-} {0 :~foo}
test filename-10.6 {Tcl_TranslateFileName} {testsetplatform} {
global env
set temp $env(HOME)
@@ -1062,60 +618,6 @@ test filename-10.10 {Tcl_TranslateFileNa
set env(HOME) $temp
set result
} {0 /home/test/foo}
-test filename-10.11 {Tcl_TranslateFileName} {testsetplatform} {
- global env
- set temp $env(HOME)
- set env(HOME) "Root:"
- testsetplatform mac
- set result [list [catch {testtranslatefilename ~/foo} msg] $msg]
- set env(HOME) $temp
- set result
-} {0 Root:foo}
-test filename-10.12 {Tcl_TranslateFileName} {testsetplatform} {
- global env
- set temp $env(HOME)
- set env(HOME) "Root:home"
- testsetplatform mac
- set result [list [catch {testtranslatefilename ~/foo} msg] $msg]
- set env(HOME) $temp
- set result
-} {0 Root:home:foo}
-test filename-10.13 {Tcl_TranslateFileName} {testsetplatform} {
- global env
- set temp $env(HOME)
- set env(HOME) "Root:home"
- testsetplatform mac
- set result [list [catch {testtranslatefilename ~::foo} msg] $msg]
- set env(HOME) $temp
- set result
-} {0 Root:home::foo}
-test filename-10.14 {Tcl_TranslateFileName} {testsetplatform} {
- global env
- set temp $env(HOME)
- set env(HOME) "Root:home"
- testsetplatform mac
- set result [list [catch {testtranslatefilename ~} msg] $msg]
- set env(HOME) $temp
- set result
-} {0 Root:home}
-test filename-10.15 {Tcl_TranslateFileName} {testsetplatform} {
- global env
- set temp $env(HOME)
- set env(HOME) "Root:home:"
- testsetplatform mac
- set result [list [catch {testtranslatefilename ~::foo} msg] $msg]
- set env(HOME) $temp
- set result
-} {0 Root:home::foo}
-test filename-10.16 {Tcl_TranslateFileName} {testsetplatform} {
- global env
- set temp $env(HOME)
- set env(HOME) "Root:home::"
- testsetplatform mac
- set result [list [catch {testtranslatefilename ~::foo} msg] $msg]
- set env(HOME) $temp
- set result
-} {0 Root:home:::foo}
test filename-10.17 {Tcl_TranslateFileName} {testsetplatform} {
global env
set temp $env(HOME)
@@ -1267,7 +769,7 @@ test filename-11.17 {Tcl_GlobCmd} {unixO
[file join $globname x,z1.c]\
[file join $globname x1.c]\
[file join $globname y1.c] [file join $globname z1.c]]]]
-test filename-11.17.1 {Tcl_GlobCmd} {pcOnly macOnly} {
+test filename-11.17.1 {Tcl_GlobCmd} {pcOnly} {
list [catch {lsort [glob -directory $globname *]} msg] $msg
} [list 0 [lsort [list [file join $globname a1] [file join $globname a2]\
[file join $globname .1]\
@@ -1397,7 +899,7 @@ test filename-11.18 {Tcl_GlobCmd} {unixO
[file join $globname x,z1.c]\
[file join $globname x1.c]\
[file join $globname y1.c] [file join $globname z1.c]]]]
-test filename-11.18.1 {Tcl_GlobCmd} {pcOnly macOnly} {
+test filename-11.18.1 {Tcl_GlobCmd} {pcOnly} {
list [catch {lsort [glob -path $globname/ *]} msg] $msg
} [list 0 [lsort [list [file join $globname a1] [file join $globname a2]\
[file join $globname .1]\
@@ -1415,7 +917,7 @@ test filename-11.19 {Tcl_GlobCmd} {unixO
[file join $globname x,z1.c]\
[file join $globname x1.c]\
[file join $globname y1.c] [file join $globname z1.c]]]]
-test filename-11.19.1 {Tcl_GlobCmd} {pcOnly macOnly} {
+test filename-11.19.1 {Tcl_GlobCmd} {pcOnly} {
list [catch {lsort [glob -join -path \
[string range $globname 0 5] * *]} msg] $msg
} [list 0 [lsort [list [file join $globname a1] [file join $globname a2]\
@@ -1457,7 +959,7 @@ test filename-11.22 {Tcl_GlobCmd} {unixO
[file join $globname x,z1.c]\
[file join $globname x1.c]\
[file join $globname y1.c] [file join $globname z1.c]]]]
-test filename-11.22.1 {Tcl_GlobCmd} {pcOnly macOnly} {
+test filename-11.22.1 {Tcl_GlobCmd} {pcOnly} {
list [catch {lsort [glob -dir $globname *]} msg] $msg
} [list 0 [lsort [list [file join $globname a1] [file join $globname a2]\
[file join $globname .1]\
@@ -1474,7 +976,7 @@ test filename-11.23 {Tcl_GlobCmd} {unixO
[file join $globname x,z1.c]\
[file join $globname x1.c]\
[file join $globname y1.c] [file join $globname z1.c]]]]
-test filename-11.23.1 {Tcl_GlobCmd} {pcOnly macOnly} {
+test filename-11.23.1 {Tcl_GlobCmd} {pcOnly} {
list [catch {lsort [glob -path $globname/ *]} msg] $msg
} [list 0 [lsort [list [file join $globname a1] [file join $globname a2]\
[file join $globname .1]\
@@ -1492,7 +994,7 @@ test filename-11.24 {Tcl_GlobCmd} {unixO
[file join $globname x,z1.c]\
[file join $globname x1.c]\
[file join $globname y1.c] [file join $globname z1.c]]]]
-test filename-11.24.1 {Tcl_GlobCmd} {pcOnly macOnly} {
+test filename-11.24.1 {Tcl_GlobCmd} {pcOnly} {
list [catch {lsort [glob -join -path \
[string range $globname 0 5] * *]} msg] $msg
} [list 0 [lsort [list [file join $globname a1] [file join $globname a2]\
@@ -1636,27 +1138,11 @@ test filename-12.1.5 {simple globbing} {
test filename-12.1.6 {simple globbing} {pcOnly} {
list [catch {glob c:/} msg] $msg
} {0 c:/}
-test filename-12.2 {simple globbing} {macOnly} {
- list [catch {glob {}} msg] $msg
-} {0 :}
-test filename-12.2.1 {simple globbing} {macOnly} {
- list [catch {glob -types f {}} msg] $msg
-} {1 {no files matched glob pattern ""}}
-test filename-12.2.2 {simple globbing} {macOnly} {
- list [catch {glob -types d {}} msg] $msg
-} {0 :}
-test filename-12.2.3 {simple globbing} {macOnly} {
- list [catch {glob -types hidden {}} msg] $msg
-} {1 {no files matched glob pattern ""}}
test filename-12.3 {simple globbing} {
list [catch {glob -nocomplain \{a1,a2\}} msg] $msg
} {0 {}}
-if {$tcl_platform(platform) == "macintosh"} {
- set globPreResult :globTest:
-} else {
- set globPreResult globTest/
-}
+set globPreResult globTest/
set x1 x1.c
set y1 y1.c
test filename-12.4 {simple globbing} {unixOrPc} {
@@ -1733,36 +1219,21 @@ test filename-13.10 {globbing with brace
test filename-13.11 {globbing with brace substitution} {unixOrPc} {
list [lsort [catch {glob globTest/\{x,x\\,z,z\}1.c} msg]] $msg
} {0 {globTest/x1.c globTest/x,z1.c globTest/z1.c}}
-test filename-13.12 {globbing with brace substitution} {macOnly} {
- list [lsort [catch {glob globTest/\{x,x\\,z,z\}1.c} msg]] $msg
-} {0 {:globTest:x1.c :globTest:x,z1.c :globTest:z1.c}}
test filename-13.13 {globbing with brace substitution} {
lsort [glob globTest/{a,b,x,y}1.c]
} [list $globPreResult$x1 $globPreResult$y1]
test filename-13.14 {globbing with brace substitution} {unixOrPc} {
lsort [glob {globTest/{x1,y2,weird name}.c}]
} {{globTest/weird name.c} globTest/x1.c}
-test filename-13.15 {globbing with brace substitution} {macOnly} {
- lsort [glob {globTest/{x1,y2,weird name}.c}]
-} {{:globTest:weird name.c} :globTest:x1.c}
test filename-13.16 {globbing with brace substitution} {unixOrPc} {
lsort [glob globTest/{x1.c,a1/*}]
} {globTest/a1/b1 globTest/a1/b2 globTest/x1.c}
-test filename-13.17 {globbing with brace substitution} {macOnly} {
- lsort [glob globTest/{x1.c,a1/*}]
-} {:globTest:a1:b1 :globTest:a1:b2 :globTest:x1.c}
test filename-13.18 {globbing with brace substitution} {unixOrPc} {
lsort [glob globTest/{x1.c,{a},a1/*}]
} {globTest/a1/b1 globTest/a1/b2 globTest/x1.c}
-test filename-13.19 {globbing with brace substitution} {macOnly} {
- lsort [glob globTest/{x1.c,{a},a1/*}]
-} {:globTest:a1:b1 :globTest:a1:b2 :globTest:x1.c}
test filename-13.20 {globbing with brace substitution} {unixOrPc} {
lsort [glob globTest/{a,x}1/*/{x,y}*]
} {globTest/a1/b1/x2.c globTest/a1/b2/y2.c}
-test filename-13.21 {globbing with brace substitution} {macOnly} {
- lsort [glob globTest/{a,x}1/*/{x,y}*]
-} {:globTest:a1:b1:x2.c :globTest:a1:b2:y2.c}
test filename-13.22 {globbing with brace substitution} {
list [catch {glob globTest/\{a,x\}1/*/\{} msg] $msg
} {1 {unmatched open-brace in file name}}
@@ -1770,15 +1241,9 @@ test filename-13.22 {globbing with brace
test filename-14.1 {asterisks, question marks, and brackets} {unixOrPc} {
lsort [glob glo*/*.c]
} {{globTest/weird name.c} globTest/x,z1.c globTest/x1.c globTest/y1.c globTest/z1.c}
-test filename-14.2 {asterisks, question marks, and brackets} {macOnly} {
- lsort [glob glo*/*.c]
-} {{:globTest:weird name.c} :globTest:x,z1.c :globTest:x1.c :globTest:y1.c :globTest:z1.c}
test filename-14.3 {asterisks, question marks, and brackets} {unixOrPc} {
lsort [glob globTest/?1.c]
} {globTest/x1.c globTest/y1.c globTest/z1.c}
-test filename-14.4 {asterisks, question marks, and brackets} {macOnly} {
- lsort [glob globTest/?1.c]
-} {:globTest:x1.c :globTest:y1.c :globTest:z1.c}
# The current directory could be anywhere; do this to stop spurious matches
file mkdir globTestContext
@@ -1789,9 +1254,6 @@ cd globTestContext
test filename-14.5 {asterisks, question marks, and brackets} {unixOrPc} {
lsort [glob */*/*/*.c]
} {globTest/a1/b1/x2.c globTest/a1/b2/y2.c}
-test filename-14.6 {asterisks, question marks, and brackets} {macOnly} {
- lsort [glob */*/*/*.c]
-} {:globTest:a1:b1:x2.c :globTest:a1:b2:y2.c}
# Reset to where we were
cd $savepwd
@@ -1804,33 +1266,18 @@ test filename-14.7 {asterisks, question
test filename-14.7.1 {asterisks, question marks, and brackets} {pcOnly} {
lsort [glob globTest/*]
} {globTest/.1 globTest/a1 globTest/a2 globTest/a3 {globTest/weird name.c} globTest/x,z1.c globTest/x1.c globTest/y1.c globTest/z1.c}
-test filename-14.8 {asterisks, question marks, and brackets} {macOnly} {
- lsort [glob globTest/*]
-} {:globTest:.1 :globTest:a1 :globTest:a2 :globTest:a3 {:globTest:weird name.c} :globTest:x,z1.c :globTest:x1.c :globTest:y1.c :globTest:z1.c}
test filename-14.9 {asterisks, question marks, and brackets} {unixOrPc} {
lsort [glob globTest/.*]
} {globTest/. globTest/.. globTest/.1}
-test filename-14.10 {asterisks, question marks, and brackets} {macOnly} {
- lsort [glob globTest/.*]
-} {:globTest:.1}
test filename-14.11 {asterisks, question marks, and brackets} {unixOrPc} {
lsort [glob globTest/*/*]
} {globTest/a1/b1 globTest/a1/b2 globTest/a2/b3}
-test filename-14.12 {asterisks, question marks, and brackets} {macOnly} {
- lsort [glob globTest/*/*]
-} {:globTest:a1:b1 :globTest:a1:b2 :globTest:a2:b3}
test filename-14.13 {asterisks, question marks, and brackets} {unixOrPc} {
lsort [glob {globTest/[xyab]1.*}]
} {globTest/x1.c globTest/y1.c}
-test filename-14.14 {asterisks, question marks, and brackets} {macOnly} {
- lsort [glob {globTest/[xyab]1.*}]
-} {:globTest:x1.c :globTest:y1.c}
test filename-14.15 {asterisks, question marks, and brackets} {unixOrPc} {
lsort [glob globTest/*/]
} {globTest/a1/ globTest/a2/ globTest/a3/}
-test filename-14.16 {asterisks, question marks, and brackets} {macOnly} {
- lsort [glob globTest/*/]
-} {:globTest:a1: :globTest:a2: :globTest:a3:}
test filename-14.17 {asterisks, question marks, and brackets} {
global env
set temp $env(HOME)
@@ -1842,9 +1289,6 @@ test filename-14.17 {asterisks, question
test filename-14.18 {asterisks, question marks, and brackets} {unixOrPc} {
list [catch {lsort [glob globTest/*.c goo/*]} msg] $msg
} {0 {{globTest/weird name.c} globTest/x,z1.c globTest/x1.c globTest/y1.c globTest/z1.c}}
-test filename-14.19 {asterisks, question marks, and brackets} {macOnly} {
- list [catch {lsort [glob globTest/*.c goo/*]} msg] $msg
-} {0 {{:globTest:weird name.c} :globTest:x,z1.c :globTest:x1.c :globTest:y1.c :globTest:z1.c}}
test filename-14.20 {asterisks, question marks, and brackets} {
list [catch {glob -nocomplain goo/*} msg] $msg
} {0 {}}
@@ -1867,7 +1311,7 @@ test filename-14.25 {type specific globb
[file join $globname x,z1.c]\
[file join $globname x1.c]\
[file join $globname y1.c] [file join $globname z1.c]]]]
-test filename-14.25.1 {type specific globbing} {pcOnly macOnly} {
+test filename-14.25.1 {type specific globbing} {pcOnly} {
list [catch {lsort [glob -dir globTest -types f *]} msg] $msg
} [list 0 [lsort [list \
[file join $globname .1]\
Index: tests/fileSystem.test
===================================================================
RCS file: /cvsroot/tcl/tcl/tests/fileSystem.test,v
retrieving revision 1.35
diff -u -p -r1.35 fileSystem.test
--- tests/fileSystem.test 28 Feb 2004 15:46:29 -0000 1.35
+++ tests/fileSystem.test 17 Mar 2004 16:00:04 -0000
@@ -89,7 +89,7 @@ test filesystem-1.1 {link normalisation}
string equal [file normalize dir.dir] [file normalize dir.link]
} {0}
-test filesystem-1.2 {link normalisation} {hasLinks macOrUnix} {
+test filesystem-1.2 {link normalisation} {hasLinks unixOnly} {
testPathEqual [file normalize [file join gorp.file foo]] \
[file normalize [file join link.file foo]]
} {1}
@@ -114,7 +114,7 @@ test filesystem-1.6 {link normalisation}
[file normalize [file join dir.link inside.file]]
} {0}
-test filesystem-1.7 {link normalisation} {hasLinks macOrUnix} {
+test filesystem-1.7 {link normalisation} {hasLinks unixOnly} {
testPathEqual [file normalize [file join dir.link linkinside.file foo]] \
[file normalize [file join dir.dir inside.file foo]]
} {1}
@@ -124,14 +124,14 @@ test filesystem-1.8 {link normalisation}
[file normalize [file join dir.link inside.filefoo]]
} {0}
-test filesystem-1.9 {link normalisation} {macOrUnix hasLinks} {
+test filesystem-1.9 {link normalisation} {unixOnly hasLinks} {
file delete -force dir.link
file link dir.link [file nativename dir.dir]
testPathEqual [file normalize [file join dir.dir linkinside.file foo]] \
[file normalize [file join dir.link inside.file foo]]
} {1}
-test filesystem-1.10 {link normalisation: double link} {macOrUnix hasLinks} {
+test filesystem-1.10 {link normalisation: double link} {unixOnly hasLinks} {
file link dir2.link dir.link
testPathEqual [file normalize [file join dir.dir linkinside.file foo]] \
[file normalize [file join dir2.link inside.file foo]]
@@ -139,7 +139,7 @@ test filesystem-1.10 {link normalisation
makeDirectory dir2.file
-test filesystem-1.11 {link normalisation: double link, back in tree} {macOrUnix hasLinks} {
+test filesystem-1.11 {link normalisation: double link, back in tree} {unixOnly hasLinks} {
file link [file join dir2.file dir2.link] [file join .. dir2.link]
testPathEqual [file normalize [file join dir.dir linkinside.file foo]] \
[file normalize [file join dir2.file dir2.link inside.file foo]]
Index: tests/interp.test
===================================================================
RCS file: /cvsroot/tcl/tcl/tests/interp.test,v
retrieving revision 1.25
diff -u -p -r1.25 interp.test
--- tests/interp.test 14 Nov 2003 20:44:46 -0000 1.25
+++ tests/interp.test 17 Mar 2004 16:00:04 -0000
@@ -17,13 +17,7 @@ if {[lsearch [namespace children] ::tclt
namespace import -force ::tcltest::*
}
-# The set of hidden commands is platform dependent:
-
-if {"$tcl_platform(platform)" == "macintosh"} {
- set hidden_cmds {beep cd echo encoding exit fconfigure file glob load ls open pwd socket source}
-} else {
- set hidden_cmds {cd encoding exec exit fconfigure file glob load open pwd socket source}
-}
+set hidden_cmds {cd encoding exec exit fconfigure file glob load open pwd socket source}
foreach i [interp slaves] {
interp delete $i
@@ -1743,24 +1737,6 @@ test interp-23.2 {testing hiding vs alia
set l
} {{cd encoding exec exit fconfigure file glob load open pwd socket source} bar {cd encoding exec exit fconfigure file glob load open pwd socket source} bar {bar cd encoding exec exit fconfigure file glob load open pwd socket source} {} {cd encoding exec exit fconfigure file glob load open pwd socket source}}
-test interp-23.3 {testing hiding vs aliases} {macOnly} {
- catch {interp delete a}
- interp create a -safe
- set l ""
- lappend l [lsort [interp hidden a]]
- a alias bar bar
- lappend l [interp aliases a]
- lappend l [lsort [interp hidden a]]
- a hide bar
- lappend l [interp aliases a]
- lappend l [lsort [interp hidden a]]
- a alias bar {}
- lappend l [interp aliases a]
- lappend l [lsort [interp hidden a]]
- interp delete a
- set l
-} {{beep cd echo encoding exit fconfigure file glob load ls open pwd socket source} bar {beep cd echo encoding exit fconfigure file glob load ls open pwd socket source} bar {bar beep cd echo encoding exit fconfigure file glob load ls open pwd socket source} {} {beep cd echo encoding exit fconfigure file glob load ls open pwd socket source}}
-
test interp-24.1 {result resetting on error} {
catch {interp delete a}
interp create a
Index: tests/io.test
===================================================================
RCS file: /cvsroot/tcl/tcl/tests/io.test,v
retrieving revision 1.49
diff -u -p -r1.49 io.test
--- tests/io.test 25 Feb 2004 23:56:59 -0000 1.49
+++ tests/io.test 17 Mar 2004 16:00:04 -0000
@@ -1550,11 +1550,7 @@ test io-13.12 {TranslateInputEOL: find E
# also testing channel table management.
if {[info commands testchannel] != ""} {
- if {$tcl_platform(platform) == "macintosh"} {
- set consoleFileNames [list console0 console1 console2]
- } else {
- set consoleFileNames [lsort [testchannel open]]
- }
+ set consoleFileNames [lsort [testchannel open]]
} else {
# just to avoid an error
set consoleFileNames [list]
@@ -1871,12 +1867,6 @@ test io-20.3 {Tcl_CreateChannel: initial
close $f
set x
} {{{} {}} {auto lf}}
-test io-20.4 {Tcl_CreateChannel: initial settings} {macOnly} {
- set f [open $path(test1) w+]
- set x [list [fconfigure $f -eofchar] [fconfigure $f -translation]]
- close $f
- set x
-} {{{} {}} {auto cr}}
set path(stdout) [makeFile {} stdout]
@@ -5252,7 +5242,7 @@ test io-40.8 {POSIX open access modes: T
close $f
set x
} abc
-test io-40.9 {POSIX open access modes: NONBLOCK} {nonPortable macOrUnix} {
+test io-40.9 {POSIX open access modes: NONBLOCK} {nonPortable unixOnly} {
file delete $path(test3)
set f [open $path(test3) {WRONLY NONBLOCK CREAT}]
puts $f "NONBLOCK test"
Index: tests/ioCmd.test
===================================================================
RCS file: /cvsroot/tcl/tcl/tests/ioCmd.test,v
retrieving revision 1.19
diff -u -p -r1.19 ioCmd.test
--- tests/ioCmd.test 7 Oct 2003 21:45:39 -0000 1.19
+++ tests/ioCmd.test 17 Mar 2004 16:00:04 -0000
@@ -287,12 +287,6 @@ proc iocmdSSHTDWN {} {
}
}
-test iocmd-8.15.0 {fconfigure command / tcp channel} {socket macOnly} {
- iocmdSSETUP
- set r [list [catch {fconfigure $cli -blah} msg] $msg]
- iocmdSSHTDWN
- set r
-} {1 {bad option "-blah": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -translation, -error, -peername, or -sockname}}
test iocmd-8.15.1 {fconfigure command / tcp channel} {socket unixOrPc} {
iocmdSSETUP
set r [list [catch {fconfigure $cli -blah} msg] $msg]
Index: tests/load.test
===================================================================
RCS file: /cvsroot/tcl/tcl/tests/load.test,v
retrieving revision 1.11
diff -u -p -r1.11 load.test
--- tests/load.test 1 Feb 2003 23:37:29 -0000 1.11
+++ tests/load.test 17 Mar 2004 16:00:04 -0000
@@ -20,12 +20,6 @@ if {[lsearch [namespace children] ::tclt
# Figure out what extension is used for shared libraries on this
# platform.
-if {$tcl_platform(platform) == "macintosh"} {
- puts "can't run dynamic library tests on macintosh machines"
- ::tcltest::cleanupTests
- return
-}
-
# Tests require the existence of one of the DLLs in the dltest directory.
set ext [info sharedlibextension]
set testDir [file join [file dirname [info nameofexecutable]] dltest]
Index: tests/macFCmd.test
===================================================================
RCS file: tests/macFCmd.test
diff -N tests/macFCmd.test
--- tests/macFCmd.test 14 May 2003 19:21:24 -0000 1.11
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,204 +0,0 @@
-# This file tests the tclfCmd.c file.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands. Sourcing this file into Tcl runs the tests and
-# generates output for errors. No output means no errors were found.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: macFCmd.test,v 1.11 2003/05/14 19:21:24 das Exp $
-#
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
- package require tcltest
- namespace import -force ::tcltest::*
-}
-
-# These tests really need to be run from a writable directory, which
-# it is assumed [temporaryDirectory] is.
-set oldcwd [pwd]
-cd [temporaryDirectory]
-
-catch {file delete -force foo.dir}
-file mkdir foo.dir
-if {[catch {file attributes foo.dir -readonly 1}]} {
- set ::tcltest::testConstraints(fileSharing) 0
- set ::tcltest::testConstraints(notFileSharing) 1
-} else {
- set ::tcltest::testConstraints(fileSharing) 1
- set ::tcltest::testConstraints(notFileSharing) 0
- file attributes foo.dir -readonly 0
-}
-file delete -force foo.dir
-
-test macFCmd-1.1 {GetFileFinderAttributes - no file} {macOnly} {
- catch {file delete -force foo.file}
- list [catch {file attributes foo.file -creator} msg] $msg
-} {1 {could not read "foo.file": no such file or directory}}
-test macFCmd-1.2 {GetFileFinderAttributes - creator} {macOnly} {
- catch {file delete -force foo.file}
- catch {close [open foo.file w]}
- list [catch {file attributes foo.file -creator} msg] \
- [regexp {MPW |CWIE} $msg] [file delete -force foo.file]
-} {0 1 {}}
-test macFCmd-1.3 {GetFileFinderAttributes - type} {macOnly} {
- catch {file delete -force foo.file}
- catch {close [open foo.file w]}
- list [catch {file attributes foo.file -type} msg] $msg \
- [file delete -force foo.file]
-} {0 TEXT {}}
-test macFCmd-1.4 {GetFileFinderAttributes - not hidden} {macOnly} {
- catch {file delete -force foo.file}
- catch {close [open foo.file w]}
- list [catch {file attributes foo.file -hidden} msg] $msg \
- [file delete -force foo.file]
-} {0 0 {}}
-test macFCmd-1.5 {GetFileFinderAttributes - hidden} {macOnly} {
- catch {file delete -force foo.file}
- catch {close [open foo.file w]}
- file attributes foo.file -hidden 1
- list [catch {file attributes foo.file -hidden} msg] $msg \
- [file delete -force foo.file]
-} {0 1 {}}
-test macFCmd-1.6 {GetFileFinderAttributes - folder creator} {macOnly} {
- catch {file delete -force foo.dir}
- file mkdir foo.dir
- list [catch {file attributes foo.dir -creator} msg] $msg \
- [file delete -force foo.dir]
-} {0 Fldr {}}
-test macFCmd-1.7 {GetFileFinderAttributes - folder type} {macOnly} {
- catch {file delete -force foo.dir}
- file mkdir foo.dir
- list [catch {file attributes foo.dir -type} msg] $msg \
- [file delete -force foo.dir]
-} {0 Fldr {}}
-test macFCmd-1.8 {GetFileFinderAttributes - folder hidden} {macOnly} {
- catch {file delete -force foo.dir}
- file mkdir foo.dir
- list [catch {file attributes foo.dir -hidden} msg] $msg \
- [file delete -force foo.dir]
-} {0 0 {}}
-
-test macFCmd-2.1 {GetFileReadOnly - bad file} {macOnly} {
- catch {file delete -force foo.file}
- list [catch {file attributes foo.file -readonly} msg] $msg
-} {1 {could not read "foo.file": no such file or directory}}
-test macFCmd-2.2 {GetFileReadOnly - file not read only} {macOnly} {
- catch {file delete -force foo.file}
- close [open foo.file w]
- list [catch {file attributes foo.file -readonly} msg] $msg \
- [file delete -force foo.file]
-} {0 0 {}}
-test macFCmd-2.3 {GetFileReadOnly - file read only} {macOnly} {
- catch {file delete -force foo.file}
- close [open foo.file w]
- file attributes foo.file -readonly 1
- list [catch {file attributes foo.file -readonly} msg] $msg \
- [file delete -force foo.file]
-} {0 1 {}}
-test macFCmd-2.4 {GetFileReadOnly - directory not read only} {macOnly} {
- catch {file delete -force foo.dir}
- file mkdir foo.dir
- list [catch {file attributes foo.dir -readonly} msg] $msg \
- [file delete -force foo.dir]
-} {0 0 {}}
-test macFCmd-2.5 {GetFileReadOnly - directory read only} {macOnly fileSharing} {
- catch {file delete -force foo.dir}
- file mkdir foo.dir
- file attributes foo.dir -readonly 1
- list [catch {file attributes foo.dir -readonly} msg] $msg \
- [file delete -force foo.dir]
-} {0 1 {}}
-
-test macFCmd-3.1 {SetFileFinderAttributes - bad file} {macOnly} {
- catch {file delete -force foo.file}
- list [catch {file attributes foo.file -creator FOOO} msg] $msg
-} {1 {could not read "foo.file": no such file or directory}}
-test macFCmd-3.2 {SetFileFinderAttributes - creator} {macOnly} {
- catch {file delete -force foo.file}
- close [open foo.file w]
- list [catch {file attributes foo.file -creator FOOO} msg] $msg \
- [file attributes foo.file -creator] [file delete -force foo.file]
-} {0 {} FOOO {}}
-test macFCmd-3.3 {SetFileFinderAttributes - bad creator} {macOnly} {
- catch {file delete -force foo.file}
- close [open foo.file w]
- list [catch {file attributes foo.file -creator 0} msg] $msg \
- [file delete -force foo.file]
-} {1 {expected Macintosh OS type but got "0"} {}}
-test macFCmd-3.4 {SetFileFinderAttributes - hidden} {macOnly} {
- catch {file delete -force foo.file}
- close [open foo.file w]
- list [catch {file attributes foo.file -hidden 1} msg] $msg \
- [file attributes foo.file -hidden] [file delete -force foo.file]
-} {0 {} 1 {}}
-test macFCmd-3.5 {SetFileFinderAttributes - type} {macOnly} {
- catch {file delete -force foo.file}
- close [open foo.file w]
- list [catch {file attributes foo.file -type FOOO} msg] $msg \
- [file attributes foo.file -type] [file delete -force foo.file]
-} {0 {} FOOO {}}
-test macFCmd-3.6 {SetFileFinderAttributes - bad type} {macOnly} {
- catch {file delete -force foo.file}
- close [open foo.file w]
- list [catch {file attributes foo.file -type 0} msg] $msg \
- [file delete -force foo.file]
-} {1 {expected Macintosh OS type but got "0"} {}}
-test macFCmd-3.7 {SetFileFinderAttributes - directory} {macOnly} {
- catch {file delete -force foo.dir}
- file mkdir foo.dir
- list [catch {file attributes foo.dir -creator FOOO} msg] \
- $msg [file delete -force foo.dir]
-} {1 {cannot set -creator: "foo.dir" is a directory} {}}
-
-test macFCmd-4.1 {SetFileReadOnly - bad file} {macOnly} {
- catch {file delete -force foo.file}
- list [catch {file attributes foo.file -readonly 1} msg] $msg
-} {1 {could not read "foo.file": no such file or directory}}
-test macFCmd-4.2 {SetFileReadOnly - file not readonly} {macOnly} {
- catch {file delete -force foo.file}
- close [open foo.file w]
- list [catch {file attributes foo.file -readonly 0} msg] \
- $msg [file attributes foo.file -readonly] [file delete -force foo.file]
-} {0 {} 0 {}}
-test macFCmd-4.3 {SetFileReadOnly - file readonly} {macOnly} {
- catch {file delete -force foo.file}
- close [open foo.file w]
- list [catch {file attributes foo.file -readonly 1} msg] \
- $msg [file attributes foo.file -readonly] [file delete -force foo.file]
-} {0 {} 1 {}}
-test macFCmd-4.4 {SetFileReadOnly - directory not readonly} \
- {macOnly fileSharing} {
- catch {file delete -force foo.dir}
- file mkdir foo.dir
- list [catch {file attributes foo.dir -readonly 0} msg] \
- $msg [file attributes foo.dir -readonly] [file delete -force foo.dir]
-} {0 {} 0 {}}
-test macFCmd-4.5 {SetFileReadOnly - directory not readonly} \
- {macOnly notFileSharing} {
- catch {file delete -force foo.dir}
- file mkdir foo.dir
- list [catch {file attributes foo.dir -readonly 0} msg] $msg \
- [file delete -force foo.dir]
-} {1 {cannot set a directory to read-only when File Sharing is turned off} {}}
-test macFCmd-4.6 {SetFileReadOnly - directory readonly} {macOnly fileSharing} {
- catch {file delete -force foo.dir}
- file mkdir foo.dir
- list [catch {file attributes foo.dir -readonly 1} msg] $msg \
- [file attributes foo.dir -readonly] [file delete -force foo.dir]
-} {0 {} 1 {}}
-test macFCmd-4.7 {SetFileReadOnly - directory readonly} {macOnly notFileSharing} {
- catch {file delete -force foo.dir}
- file mkdir foo.dir
- list [catch {file attributes foo.dir -readonly 1} msg] $msg \
- [file delete -force foo.dir]
-} {1 {cannot set a directory to read-only when File Sharing is turned off} {}}
-
-# cleanup
-cd $oldcwd
-::tcltest::cleanupTests
-return
Index: tests/osa.test
===================================================================
RCS file: tests/osa.test
diff -N tests/osa.test
--- tests/osa.test 10 Apr 2000 17:19:02 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,48 +0,0 @@
-# Commands covered: AppleScript
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands. Sourcing this file into Tcl runs the tests and
-# generates output for errors. No output means no errors were found.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: osa.test,v 1.6 2000/04/10 17:19:02 ericm Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
- package require tcltest
- namespace import -force ::tcltest::*
-}
-
-# Only run the test if we can load the AppleScript command
-set ::tcltest::testConstraints(appleScript) [expr {[info commands AppleScript] != ""}]
-
-test osa-1.1 {Tcl_OSAComponentCmd} {macOnly appleScript} {
- list [catch AppleScript msg] $msg
-} {1 {wrong # args: should be "AppleScript option ?arg ...?"}}
-test osa-1.2 {Tcl_OSAComponentCmd} {macOnly appleScript} {
- list [catch {AppleScript x} msg] $msg
-} {1 {bad option "x": should be compile, decompile, delete, execute, info, load, run or store}}
-
-test osa-1.3 {TclOSACompileCmd} {macOnly appleScript} {
- list [catch {AppleScript compile} msg] $msg
-} {1 {wrong # args: should be "AppleScript compile ?options? code"}}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
Index: tests/resource.test
===================================================================
RCS file: tests/resource.test
diff -N tests/resource.test
--- tests/resource.test 23 Oct 2003 10:07:30 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,369 +0,0 @@
-# Commands covered: resource
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands. Sourcing this file into Tcl runs the tests and
-# generates output for errors. No output means no errors were found.
-#
-# Copyright (c) 1996-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: resource.test,v 1.9 2003/10/23 10:07:30 vincentdarley Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
- package require tcltest
- namespace import -force ::tcltest::*
-}
-
-test resource-1.1 {resource tests} {macOnly} {
- list [catch {resource} msg] $msg
-} {1 {wrong # args: should be "resource option ?arg ...?"}}
-test resource-1.2 {resource tests} {macOnly} {
- list [catch {resource _bad_} msg] $msg
-} {1 {bad option "_bad_": must be close, delete, files, list, open, read, types, or write}}
-
-# resource open & close tests
-test resource-2.1 {resource open & close tests} {macOnly} {
- list [catch {resource open} msg] $msg
-} {1 {wrong # args: should be "resource open fileName ?permissions?"}}
-test resource-2.2 {resource open & close tests} {macOnly} {
- list [catch {resource open resource.test r extraArg} msg] $msg
-} {1 {wrong # args: should be "resource open fileName ?permissions?"}}
-test resource-2.3 {resource open & close tests} {macOnly} {
- list [catch {resource open resource.test bad_perms} msg] $msg
-} {1 {illegal access mode "bad_perms"}}
-test resource-2.4 {resource open & close tests} {macOnly} {
- list [catch {resource open _bad_file_} msg] $msg
-} {1 {file does not exist}}
-test resource-2.5 {resource open & close tests} {macOnly} {
- testWriteTextResource -rsrc fileRsrcName -file rsrc.file {error "don't source me"}
- set id [resource open rsrc.file]
- resource close $id
- file delete rsrc.file
-} {}
-test resource-2.6 {resource open & close tests} {macOnly} {
- catch {file delete rsrc.file}
- testWriteTextResource -rsrc fileRsrcName -file rsrc.file {A test string}
- set id [resource open rsrc.file]
- set result [string compare [resource open rsrc.file] $id]
- lappend result [resource read TEXT fileRsrcName $id]
- resource close $id
- file delete rsrc.file
- set result
-} {0 {A test string}}
-test resource-2.7 {resource open & close tests} {macOnly} {
- catch {file delete rsrc.file}
- testWriteTextResource -rsrc fileRsrcName -file rsrc.file {error "don't source me"}
- set id [resource open rsrc.file r]
- set result [catch {resource open rsrc.file w} mssg]
- resource close $id
- file delete rsrc.file
- lappend result $mssg
- set result
-} {1 {Resource already open with different permissions.}}
-test resource-2.8 {resource open & close tests} {macOnly} {
- list [catch {resource close} msg] $msg
-} {1 {wrong # args: should be "resource close resourceRef"}}
-test resource-2.9 {resource open & close tests} {macOnly} {
- list [catch {resource close foo bar} msg] $msg
-} {1 {wrong # args: should be "resource close resourceRef"}}
-test resource-2.10 {resource open & close tests} {macOnly} {
- list [catch {resource close _bad_resource_} msg] $msg
-} {1 {invalid resource file reference "_bad_resource_"}}
-test resource-2.11 {resource open & close tests} {macOnly} {
- set result [catch {resource close System} mssg]
- lappend result $mssg
-} {1 {can't close "System" resource file}}
-test resource-2.12 {resource open & close tests} {macOnly} {
- set result [catch {resource close application} mssg]
- lappend result $mssg
-} {1 {can't close "application" resource file}}
-
-# Tests for listing resources
-test resource-3.1 {resource list tests} {macOnly} {
- list [catch {resource list} msg] $msg
-} {1 {wrong # args: should be "resource list resourceType ?resourceRef?"}}
-test resource-3.2 {resource list tests} {macOnly} {
- list [catch {resource list _bad_type_} msg] $msg
-} {1 {expected Macintosh OS type but got "_bad_type_"}}
-test resource-3.3 {resource list tests} {macOnly} {
- list [catch {resource list TEXT _bad_ref_} msg] $msg
-} {1 {invalid resource file reference "_bad_ref_"}}
-test resource-3.4 {resource list tests} {macOnly} {
- list [catch {resource list TEXT _bad_ref_ extraArg} msg] $msg
-} {1 {wrong # args: should be "resource list resourceType ?resourceRef?"}}
-test resource-3.5 {resource list tests} {macOnly} {
- catch {file delete rsrc.file}
- testWriteTextResource -rsrc fileRsrcName -file rsrc.file {error "don't source me"}
- set id [resource open rsrc.file]
- catch "resource list TEXT $id" result
- resource close $id
- set result
-} {fileRsrcName}
-test resource-3.6 {resource list tests} {macOnly} {
- # There should not be any resource of this type
- resource list XXXX
-} {}
-test resource-3.7 {resource list tests} {macOnly} {
- set resourceList [resource list STR#]
- if {[lsearch $resourceList {Tcl Environment Variables}] == -1} {
- set result {couldn't find resource that should exist}
- } else {
- set result ok
- }
-} {ok}
-
-# Tests for reading resources
-test resource-4.1 {resource read tests} {macOnly} {
- list [catch {resource read} msg] $msg
-} {1 {wrong # args: should be "resource read resourceType resourceId ?resourceRef?"}}
-test resource-4.2 {resource read tests} {macOnly} {
- list [catch {resource read TEXT} msg] $msg
-} {1 {wrong # args: should be "resource read resourceType resourceId ?resourceRef?"}}
-test resource-4.3 {resource read tests} {macOnly} {
- list [catch {resource read STR# {_non_existant_resource_}} msg] $msg
-} {1 {could not load resource}}
-test resource-4.4 {resource read tests} {macOnly} {
- # The following resource should exist and load OK without error
- catch {resource read STR# {Tcl Environment Variables}}
-} {0}
-
-# Tests for getting resource types
-test resource-5.1 {resource types tests} {macOnly} {
- list [catch {resource types _bad_ref_} msg] $msg
-} {1 {invalid resource file reference "_bad_ref_"}}
-test resource-5.2 {resource types tests} {macOnly} {
- list [catch {resource types _bad_ref_ extraArg} msg] $msg
-} {1 {wrong # args: should be "resource types ?resourceRef?"}}
-test resource-5.3 {resource types tests} {macOnly} {
- # This should never cause an error
- catch {resource types}
-} {0}
-test resource-5.4 {resource types tests} {macOnly} {
- testWriteTextResource -rsrc fileRsrcName -file rsrc.file {error "don't source me"}
- set id [resource open rsrc.file]
- set result [resource types $id]
- resource close $id
- set result
-} {TEXT}
-test resource-5.5 {resource types lists} {macOnly} {
- # This should not crash
- catch {foreach f [resource types] { resource list $f }}
-} {0}
-
-# resource write tests
-test resource-6.1 {resource write tests} {macOnly} {
- list [catch {resource write} msg] $msg
-} {1 {wrong # args: should be "resource write ?-id resourceId? ?-name resourceName? ?-file resourceRef? ?-force? resourceType data"}}
-test resource-6.2 {resource write tests} {macOnly} {
- list [catch {resource write _bad_type_ data} msg] $msg
-} {1 {expected Macintosh OS type but got "_bad_type_"}}
-test resource-6.3 {resource write tests} {macOnly} {
- catch {file delete rsrc2.file}
- set id [resource open rsrc2.file w]
- resource close $id
- set id [resource open rsrc2.file r]
- set result [catch {resource write -file $id -name Hello TEXT foo} errMsg]
- lappend result [string compare $errMsg "cannot write to resource file \"$id\", it was opened read only"]
- lappend result [lsearch [resource list TEXT $id] Hello]
- resource close $id
- file delete rsrc2.file
- set result
-} {1 0 -1}
-test resource-6.4 {resource write tests} {macOnly} {
- catch {file delete rsrc2.file}
- set id [resource open rsrc2.file w]
- resource write -file $id -name Hello TEXT {set x "our test data"}
- source -rsrc Hello rsrc2.file
- resource close $id
- file delete rsrc2.file
- set x
-} {our test data}
-test resource-6.5 {resource write tests} {macOnly} {
- catch {file delete rsrc2.file}
- set id [resource open rsrc2.file w]
- resource write -file $id -id 256 TEXT {HAHAHAHAHAHAHA}
- set result [catch {resource write -file $id -id 256 TEXT {HOHOHOHOHOHO}} mssg]
- resource close $id
- file delete rsrc2.file
- lappend result $mssg
-} {1 {the resource 256 already exists, use "-force" to overwrite it.}}
-test resource-6.6 {resource write tests} {macOnly} {
- catch {file delete rsrc2.file}
- testWriteTextResource -rsrc fileRsrcName -rsrcid 256 -file rsrc2.file -protected {error "don't tread on me"}
- set id [resource open rsrc2.file w]
- set result [catch {resource write -id 256 -force -file $id TEXT {NAHNAHNANAHNAH}} mssg]
- resource close $id
- file delete rsrc2.file
- lappend result $mssg
-} {1 {could not write resource id 256 of type TEXT, it was protected.}}
-test resource-6.7 {resource write tests} {macOnly} {
- catch {file delete rsrc2.file}
- set id [resource open rsrc2.file w]
- resource write -file $id -id 256 -name FOO TEXT {set x [list "our first test data"]}
- resource write -file $id -id 256 -name BAR -force TEXT {set x [list "our second test data"]}
- source -rsrcid 256 rsrc2.file
- lappend x [resource list TEXT $id]
- resource close $id
- file delete rsrc2.file
- set x
-} {{our second test data} BAR}
-
-#Tests for listing open resource files
-test resource-7.1 {resource file tests} {macOnly} {
- catch {resource files foo bar} mssg
- set mssg
-} {wrong # args: should be "resource files ?resourceId?"}
-test resource-7.2 {resource file tests} {macOnly} {
- catch {file delete rsrc2.file}
- set rsrcFiles [resource files]
- set id [resource open rsrc2.file w]
- set result [string compare $rsrcFiles [lrange [resource files] 1 end]]
- lappend result [string compare $id [lrange [resource files] 0 0]]
- resource close $id
- file delete rsrc2.file
- set result
-} {0 0}
-test resource-7.3 {resource file tests} {macOnly} {
- set result 0
- foreach file [resource files] {
- if {[catch {resource types $file}] != 0} {
- set result 1
- }
- }
- set result
-} {0}
-test resource-7.4 {resource file tests} {macOnly} {
- catch {resource files __NO_SUCH_RESOURCE__} mssg
- set mssg
-} {invalid resource file reference "__NO_SUCH_RESOURCE__"}
-test resource-7.5 {resource file tests} {macOnly} {
- set sys [resource files System]
- string compare $sys [file join $env(SYS_FOLDER) System]
-} {0}
-test resource-7.6 {resource file tests} {macOnly} {
- set app [resource files application]
- string compare $app [info nameofexecutable]
-} {0}
-
-#Tests for the resource delete command
-test resource-8.1 {resource delete tests} {macOnly} {
- list [catch {resource delete} msg] $msg
-} {1 {wrong # args: should be "resource delete ?-id resourceId? ?-name resourceName? ?-file resourceRef? resourceType"}}
-test resource-8.2 {resource delete tests} {macOnly} {
- list [catch {resource delete TEXT} msg] $msg
-} {1 {you must specify either "-id" or "-name" or both to "resource delete"}}
-test resource-8.3 {resource delete tests} {macOnly} {
- set result [catch {resource delete -file ffffff -id 128 TEXT} mssg]
- lappend result $mssg
-} {1 {invalid resource file reference "ffffff"}}
-test resource-8.4 {resource delete tests} {macOnly} {
- catch {file delete rsrc2.file}
- testWriteTextResource -rsrc fileRsrcName -rsrcid 128 -file rsrc2.file {Some stuff}
- set id [resource open rsrc2.file r]
- set result [catch {resource delete -id 128 -file $id TEXT} mssg]
- resource close $id
- file delete rsrc2.file
- lappend result [string compare $mssg "cannot delete from resource file \"$id\", it was opened read only"]
-} {1 0}
-test resource-8.5 {resource delete tests} {macOnly} {
- catch {file delete rsrc2.file}
- testWriteTextResource -rsrc fileRsrcName -rsrcid 128 -file rsrc2.file {Some stuff}
- set id [resource open rsrc2.file w]
- set result [catch {resource delete -id 128 -file $id _bad_type_} mssg]
- resource close $id
- file delete rsrc2.file
- lappend result $mssg
-} {1 {expected Macintosh OS type but got "_bad_type_"}}
-test resource-8.5.1 {resource delete tests} {macOnly} {
- catch {file delete rsrc2.file}
- set id [resource open rsrc2.file w]
- set result [catch {resource delete -id 128 -file $id TEXT} mssg]
- resource close $id
- file delete rsrc2.file
- lappend result $mssg
-} {1 {resource not found}}
-test resource-8.6 {resource delete tests} {macOnly} {
- catch {file delete rsrc2.file}
- set id [resource open rsrc2.file w]
- set result [catch {resource delete -name foo -file $id TEXT} mssg]
- resource close $id
- file delete rsrc2.file
- lappend result $mssg
-} {1 {resource not found}}
-test resource-8.7 {resource delete tests} {macOnly} {
- catch {file delete rsrc2.file}
- set id [resource open rsrc2.file w]
- resource write -file $id -name foo -id 128 TEXT {some stuff}
- resource write -file $id -name bar -id 129 TEXT {some stuff}
- set result [catch {resource delete -name foo -id 129 -file $id TEXT} mssg]
- resource close $id
- file delete rsrc2.file
- lappend result $mssg
-} {1 {"-id" and "-name" values do not point to the same resource}}
-test resource-8.8 {resource delete tests} {macOnly} {
- catch {file delete rsrc2.file}
- testWriteTextResource -rsrc fileRsrcName -rsrcid 256 -file rsrc2.file -protected {error "don't tread on me"}
- set id [resource open rsrc2.file w]
- set result [catch {resource delete -id 256 -file $id TEXT } mssg]
- resource close $id
- file delete rsrc2.file
- lappend result $mssg
-} {1 {resource cannot be deleted: it is protected.}}
-test resource-8.9 {resource delete tests} {macOnly} {
- catch {file delete rsrc2.file}
- testWriteTextResource -rsrc fileRsrcName -rsrcid 128 -file rsrc2.file {Some stuff}
- set id [resource open rsrc2.file w]
- set result [resource list TEXT $id]
- resource delete -id 128 -file $id TEXT
- lappend result [resource list TEXT $id]
- resource close $id
- file delete rsrc2.file
- set result
-} {fileRsrcName {}}
-
-# Tests for the Mac version of the source command
-catch {file delete rsrc.file}
-test resource-9.1 {source command} {macOnly} {
- testWriteTextResource -rsrc fileRsrcName -rsrcid 128 \
- -file rsrc.file {set rsrc_foo 1}
- catch {unset rsrc_foo}
- source -rsrc fileRsrcName rsrc.file
- list [catch {set rsrc_foo} msg] $msg
-} {0 1}
-test resource-9.2 {source command} {macOnly} {
- catch {unset rsrc_foo}
- list [catch {source -rsrc no_resource rsrc.file} msg] $msg
-} {1 {The resource "no_resource" could not be loaded from rsrc.file.}}
-test resource-9.3 {source command} {macOnly} {
- catch {unset rsrc_foo}
- source -rsrcid 128 rsrc.file
- list [catch {set rsrc_foo} msg] $msg
-} {0 1}
-test resource-9.4 {source command} {macOnly} {
- catch {unset rsrc_foo}
- list [catch {source -rsrcid bad_int rsrc.file} msg] $msg
-} {1 {expected integer but got "bad_int"}}
-test resource-9.5 {source command} {macOnly} {
- catch {unset rsrc_foo}
- list [catch {source -rsrcid 100 rsrc.file} msg] $msg
-} {1 {The resource "ID=100" could not be loaded from rsrc.file.}}
-
-# cleanup
-catch {file delete rsrc.file}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
Index: tests/socket.test
===================================================================
RCS file: /cvsroot/tcl/tcl/tests/socket.test,v
retrieving revision 1.28
diff -u -p -r1.28 socket.test
--- tests/socket.test 25 Feb 2004 23:56:59 -0000 1.28
+++ tests/socket.test 17 Mar 2004 16:00:04 -0000
@@ -93,7 +93,7 @@ if {![info exists remoteServerPort]} {
#
set doTestsWithRemoteServer 1
-if {![info exists remoteServerIP] && ($tcl_platform(platform) != "macintosh")} {
+if {![info exists remoteServerIP]} {
set remoteServerIP 127.0.0.1
}
if {($doTestsWithRemoteServer == 1) && (![info exists remoteServerPort])} {
@@ -1149,12 +1149,6 @@ test socket-11.5 {remote echo, 50 lines}
sendCommand {close $socket10_7_test_server}
set cnt
} 50
-# Macintosh sockets can have more than one server per port
-if {$tcl_platform(platform) == "macintosh"} {
- set conflictResult {0 2836}
-} else {
- set conflictResult {1 {couldn't open socket: address already in use}}
-}
test socket-11.6 {socket conflict} {socket doTestsWithRemoteServer} {
set s1 [socket -server accept 2836]
if {[catch {set s2 [socket -server accept 2836]} msg]} {
@@ -1165,7 +1159,7 @@ test socket-11.6 {socket conflict} {sock
}
close $s1
set result
-} $conflictResult
+} {1 {couldn't open socket: address already in use}}
test socket-11.7 {server with several clients} {socket doTestsWithRemoteServer} {
sendCommand {
set socket10_9_test_server [socket -server accept 2836]
Index: tests/source.test
===================================================================
RCS file: /cvsroot/tcl/tcl/tests/source.test,v
retrieving revision 1.11
diff -u -p -r1.11 source.test
--- tests/source.test 25 Feb 2004 23:56:59 -0000 1.11
+++ tests/source.test 17 Mar 2004 16:00:04 -0000
@@ -192,109 +192,6 @@ test source-3.5 {return with special cod
"source $sourcefile"} {a b c}}
-# Test for the Macintosh specfic features of the source command
-test source-4.1 {source error conditions} -constraints macOnly -body {
- source -rsrc _no_exist_
-} -result {The resource "_no_exist_" could not be loaded from application.} \
- -returnCodes error
-
-test source-4.2 {source error conditions} -constraints macOnly -body {
- source -rsrcid bad_id
-} -returnCodes error -result {expected integer but got "bad_id"}
-
-test source-4.3 {source error conditions} -constraints macOnly -body {
- source -rsrc rsrcName fileName extra
-} -returnCodes error -result {wrong # args: should be "source fileName" or "source -rsrc name ?fileName?" or "source -rsrcid id ?fileName?" or "source -encoding name fileName"}
-
-test source-4.4 {source error conditions} -constraints macOnly -body {
- source non_switch rsrcName
-} -returnCodes error -result {bad argument: should be "source fileName" or "source -rsrc name ?fileName?" or "source -rsrcid id ?fileName?" or "source -encoding name fileName"}
-
-test source-4.5 {source error conditions} -constraints macOnly -body {
- source -bad_switch argument
-} -returnCodes error -result {bad argument: should be "source fileName" or "source -rsrc name ?fileName?" or "source -rsrcid id ?fileName?" or "source -encoding name fileName"}
-
-
-testConstraint testWriteTextResource \
- [llength [info commands testWriteTextResource]]
-
-test source-5.1 {source resource files} -constraints macOnly -setup {
- set sourcefile [makeFile {} bad_file]
- removeFile bad_file
-} -body {
- source -rsrc rsrcName $sourcefile
-} -returnCodes error -match glob -result {Error finding the file: "*bad_file".}
-
-test source-5.2 {source resource files} -constraints macOnly -setup {
- set sourcefile [makeFile {return} source.file]
-} -body {
- source -rsrc rsrcName $sourcefile
-} -cleanup {
- removeFile source.file
-} -returnCodes error -match glob \
- -result {Error reading the file: "*source.file".}
-
-test source-5.3 {source resource files} -constraints {
- macOnly testWriteTextResource
-} -setup {
- set msg2 unset
- set rsrcFile [makeFile {} rsrc.file]
- removeFile rsrc.file
- testWriteTextResource -rsrc rsrcName -file $rsrc.file {set msg2 ok; return}
-} -body {
- set result [catch {source -rsrc rsrcName rsrc.file} msg]
- list $msg2 $result $msg
-} -cleanup {
- removeFile rsrc.file
-} -result [list ok 0 {}]
-
-test source-5.4 {source resource files} -constraints {
- macOnly testWriteTextResource
-} -setup {
- set msg2 unset
- set rsrsFile [makeFile {} rsrc.file]
- removeFile rsrc.file
- testWriteTextResource -rsrc fileRsrcName \
- -file $rsrcFile {set msg2 ok; return}
-} -body {
- source -rsrc fileRsrcName $rsrcFile
- set result [catch {source -rsrc fileRsrcName} msg]
- list $msg2 $result $msg
-} -cleanup {
- removeFile rsrc.file
-} -result [list ok 1 {The resource "fileRsrcName" could not be loaded from application.}]
-
-test source-5.5 {source resource files} -constraints {
- macOnly testWriteTextResource
-} -setup {
- set msg2 unset
- set rsrcFile [makeFile {} rsrc.file]
- removeFile rsrc.file
- testWriteTextResource -rsrcid 200 \
- -file $rsrcFile {set msg2 hello; set msg3 bye}
-} -body {
- set result [catch {source -rsrcid 200 $rsrcFile} msg]
- list $msg2 $result $msg
-} -cleanup {
- removeFile rsrc.file
-} -result [list hello 0 bye]
-
-test source-5.6 {source resource files} -constraints {
- macOnly testWriteTextResource
-} -setup {
- set msg2 unset
- set rsrcFile [makeFile {} rsrc.file]
- removeFile rsrc.file
- testWriteTextResource -rsrcid 200 \
- -file $rsrcFile {set msg2 hello; error bad; set msg3 bye}
-} -body {
- set result [catch {source -rsrcid 200 rsrc.file} msg]
- list $msg2 $result $msg
-} -cleanup {
- removeFile rsrc.file
-} -result [list hello 1 bad]
-
-
test source-6.1 {source is binary ok} -setup {
# Note [makeFile] writes in the system encoding.
# [source] defaults to reading in the system encoding.
Index: tests/tcltest.test
===================================================================
RCS file: /cvsroot/tcl/tcl/tests/tcltest.test,v
retrieving revision 1.37
diff -u -p -r1.37 tcltest.test
--- tests/tcltest.test 31 Jan 2003 22:19:30 -0000 1.37
+++ tests/tcltest.test 17 Mar 2004 16:00:04 -0000
@@ -525,9 +525,6 @@ set a [makeFile {
set tdiaf [makeFile {} thisdirectoryisafile]
set normaldirectory [makeDirectory normaldirectory]
-if {$::tcl_platform(platform) == "macintosh"} {
-set normaldirectory [file normalize $normaldirectory]
-}
# -tmpdir, [temporaryDirectory]
test tcltest-8.1 {tcltest a.tcl -tmpdir a} {unixOrPc} {
Index: tests/unload.test
===================================================================
RCS file: /cvsroot/tcl/tcl/tests/unload.test,v
retrieving revision 1.1
diff -u -p -r1.1 unload.test
--- tests/unload.test 24 Feb 2004 22:58:48 -0000 1.1
+++ tests/unload.test 17 Mar 2004 16:00:04 -0000
@@ -21,12 +21,6 @@ if {[lsearch [namespace children] ::tclt
# Figure out what extension is used for shared libraries on this
# platform.
-if {$tcl_platform(platform) == "macintosh"} {
- puts "can't run dynamic library tests on macintosh machines"
- ::tcltest::cleanupTests
- return
-}
-
# Tests require the existence of one of the DLLs in the dltest directory.
set ext [info sharedlibextension]
set testDir [file join [file dirname [info nameofexecutable]] dltest]
Index: tools/cvtEOL.tcl
===================================================================
RCS file: tools/cvtEOL.tcl
diff -N tools/cvtEOL.tcl
--- tools/cvtEOL.tcl 16 Apr 1999 00:47:38 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-# cvtEOL.tcl --
-#
-# This file contains a script to parse a Tcl/Tk distribution and
-# convert the EOL from \n to \r on all text files.
-#
-# Copyright (c) 1996-1997 by Sun Microsystems, Inc.
-#
-# SCCS: @(#) cvtEOL.tcl 1.1 97/01/30 11:33:33
-#
-
-#
-# Convert files in the distribution to Mac style
-#
-
-set distDir [lindex $argv 0]
-
-set dirs {unix mac generic win library compat tests unix/dltest \
- library/demos library/demos/images bitmaps xlib xlib/X11 .}
-set files {*.c *.y *.h *.r *.tcl *.test *.rc *.bc *.vc *.bmp *.html \
- *.in *.notes *.terms all defs \
- README ToDo changes tclIndex configure install-sh mkLinks \
- square widget rmt ixset hello browse rolodex tcolor timer}
-
-foreach x $dirs {
- if [catch {cd $distDir/$x}] continue
- puts "Working on $x..."
- foreach y [eval glob $files] {
- exec chmod 666 $y
- exec cp $y $y.tmp
- exec tr \012 \015 < $y.tmp > $y
- exec chmod 444 $y
- exec rm $y.tmp
- }
-}
-
Index: tools/genStubs.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/tools/genStubs.tcl,v
retrieving revision 1.16
diff -u -p -r1.16 genStubs.tcl
--- tools/genStubs.tcl 25 Aug 2003 21:04:57 -0000 1.16
+++ tools/genStubs.tcl 17 Mar 2004 16:00:04 -0000
@@ -122,7 +122,7 @@ proc genStubs::hooks {names} {
# Arguments:
# index The index number of the interface.
# platform The platform the interface belongs to. Should be one
-# of generic, win, unix, or mac, or macosx or aqua or x11.
+# of generic, win, unix, or macosx or aqua or x11.
# decl The C function declaration, or {} for an undefined
# entry.
#
@@ -221,11 +221,8 @@ proc genStubs::addPlatformGuard {plat te
return "#ifdef __WIN32__\n${text}#endif /* __WIN32__ */\n"
}
unix {
- return "#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */\n${text}#endif /* UNIX */\n"
+ return "#if !defined(__WIN32__) /* UNIX */\n${text}#endif /* UNIX */\n"
}
- mac {
- return "#ifdef MAC_TCL\n${text}#endif /* MAC_TCL */\n"
- }
macosx {
return "#ifdef MAC_OSX_TCL\n${text}#endif /* MAC_OSX_TCL */\n"
}
@@ -233,7 +230,7 @@ proc genStubs::addPlatformGuard {plat te
return "#ifdef MAC_OSX_TK\n${text}#endif /* MAC_OSX_TK */\n"
}
x11 {
- return "#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* X11 */\n${text}#endif /* X11 */\n"
+ return "#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */\n${text}#endif /* X11 */\n"
}
}
return "$text"
@@ -615,7 +612,7 @@ proc genStubs::forAllStubs {name slotPro
append text [$slotProc $name $stubs($name,generic,$i) $i]
set emit 1
} elseif {[llength $slots] > 0} {
- foreach plat {unix win mac} {
+ foreach plat {unix win} {
if {[info exists stubs($name,$plat,$i)]} {
append text [addPlatformGuard $plat \
[$slotProc $name $stubs($name,$plat,$i) $i]]
@@ -658,7 +655,7 @@ proc genStubs::forAllStubs {name slotPro
} else {
# Emit separate stubs blocks per platform
- foreach plat {unix win mac} {
+ foreach plat {unix win} {
if {[info exists stubs($name,$plat,lastNum)]} {
set lastNum $stubs($name,$plat,lastNum)
set temp {}
Index: unix/Makefile.in
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/Makefile.in,v
retrieving revision 1.134
diff -u -p -r1.134 Makefile.in
--- unix/Makefile.in 24 Feb 2004 22:58:48 -0000 1.134
+++ unix/Makefile.in 17 Mar 2004 16:00:04 -0000
@@ -1329,14 +1329,6 @@ dist: $(UNIX_DIR)/configure mklinks
$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/tcl.ds*
cp -p $(TOP_DIR)/win/README $(DISTDIR)/win
cp -p $(TOP_DIR)/license.terms $(DISTDIR)/win
- mkdir $(DISTDIR)/mac
- cp -p $(TOP_DIR)/mac/tcl*.sea.hqx \
- $(TOP_DIR)/mac/*.c $(TOP_DIR)/mac/*.h $(TOP_DIR)/mac/*.r \
- $(DISTDIR)/mac
- cp -p $(TOP_DIR)/mac/porting.notes $(TOP_DIR)/mac/README $(DISTDIR)/mac
- cp -p $(TOP_DIR)/mac/*.pch $(DISTDIR)/mac
- cp -p $(TOP_DIR)/mac/*.doc $(TOP_DIR)/mac/*.html $(DISTDIR)/mac
- cp -p $(TOP_DIR)/license.terms $(DISTDIR)/mac
mkdir $(DISTDIR)/macosx
cp -p $(TOP_DIR)/macosx/Makefile \
$(TOP_DIR)/macosx/*.c \
@@ -1405,20 +1397,6 @@ BUILD_HTML = \
--srcdir=$(TOP_DIR)/..
#
-# Target to create a Macintosh version of the distribution. This will
-# do a normal distribution and then massage the output to prepare it
-# for moving to the Mac platform. This requires a few scripts and
-# programs found only in the Tcl group's tool workspace.
-#
-
-macdist: dist machtml
-
-machtml:
- rm -f $(DISTDIR)/mac/tclMacProjects.sea.hqx
- rm -rf $(DISTDIR)/doc
- $(TCL_EXE) $(TOOL_DIR)/cvtEOL.tcl $(DISTDIR)
-
-#
# Targets to build Solaris package of the distribution for the current
# architecture. To build stream packages for both sun4 and i86pc
# architectures:
Index: unix/README
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/README,v
retrieving revision 1.24
diff -u -p -r1.24 README
--- unix/README 10 Oct 2002 04:56:21 -0000 1.24
+++ unix/README 17 Mar 2004 16:00:04 -0000
@@ -6,7 +6,7 @@ RCS: @(#) $Id: README,v 1.24 2002/10/10
This is the directory where you configure, compile, test, and install
UNIX versions of Tcl. This directory also contains source files for Tcl
that are specific to UNIX. Some of the files in this directory are
-used on the PC or Mac platform too, but they all depend on UNIX
+used on the PC or MacOSX platform too, but they all depend on UNIX
(POSIX/ANSI C) interfaces and some of them only make sense under UNIX.
Updated forms of the information found in this file is available at:
@@ -22,7 +22,7 @@ changes on any UNIX-like system that app
V. We know that it runs on workstations from Sun, H-P, DEC, IBM, and
SGI, as well as PCs running Linux, BSDI, and SCO UNIX. To compile for
a PC running Windows, see the README file in the directory ../win. To
-compile for a Macintosh, see the README file in the directory ../mac.
+compile for MacOSX, see the README file in the directory ../macosx.
How To Compile And Install Tcl:
-------------------------------
Index: unix/mkLinks
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/mkLinks,v
retrieving revision 1.56
diff -u -p -r1.56 mkLinks
--- unix/mkLinks 24 Feb 2004 23:02:28 -0000 1.56
+++ unix/mkLinks 17 Mar 2004 16:00:04 -0000
@@ -852,24 +852,6 @@ if test -r ListObj.3; then
ln $S ListObj.3$Z Tcl_ListObjIndex.3$Z
ln $S ListObj.3$Z Tcl_ListObjReplace.3$Z
fi
-if test -r Macintosh.3; then
- rm -f Macintosh.3.*
- $ZIP Macintosh.3
- rm -f Tcl_MacSetEventProc.3 Tcl_MacSetEventProc.3.*
- rm -f Tcl_MacConvertTextResource.3 Tcl_MacConvertTextResource.3.*
- rm -f Tcl_MacEvalResource.3 Tcl_MacEvalResource.3.*
- rm -f Tcl_MacFindResource.3 Tcl_MacFindResource.3.*
- rm -f Tcl_GetOSTypeFromObj.3 Tcl_GetOSTypeFromObj.3.*
- rm -f Tcl_SetOSTypeObj.3 Tcl_SetOSTypeObj.3.*
- rm -f Tcl_NewOSTypeObj.3 Tcl_NewOSTypeObj.3.*
- ln $S Macintosh.3$Z Tcl_MacSetEventProc.3$Z
- ln $S Macintosh.3$Z Tcl_MacConvertTextResource.3$Z
- ln $S Macintosh.3$Z Tcl_MacEvalResource.3$Z
- ln $S Macintosh.3$Z Tcl_MacFindResource.3$Z
- ln $S Macintosh.3$Z Tcl_GetOSTypeFromObj.3$Z
- ln $S Macintosh.3$Z Tcl_SetOSTypeObj.3$Z
- ln $S Macintosh.3$Z Tcl_NewOSTypeObj.3$Z
-fi
if test -r Namespace.3; then
rm -f Namespace.3.*
$ZIP Namespace.3
@@ -1816,10 +1798,6 @@ if test -r rename.n; then
rm -f rename.n.*
$ZIP rename.n
fi
-if test -r resource.n; then
- rm -f resource.n.*
- $ZIP resource.n
-fi
if test -r return.n; then
rm -f return.n.*
$ZIP return.n
Index: unix/tcl.spec
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tcl.spec,v
retrieving revision 1.18
diff -u -p -r1.18 tcl.spec
--- unix/tcl.spec 2 Mar 2004 00:42:51 -0000 1.18
+++ unix/tcl.spec 17 Mar 2004 16:00:04 -0000
@@ -20,7 +20,7 @@ The Tcl (Tool Command Language) provides
creating integration applications that tie together diverse
applications, protocols, devices, and frameworks. When paired with
the Tk toolkit, Tcl provides the fastest and most powerful way to
-create GUI applications that run on PCs, Unix, and the Macintosh. Tcl
+create GUI applications that run on PCs, Unix, and Mac OS X. Tcl
can also be used for a variety of web-related tasks and for creating
powerful command languages for applications.
Index: win/README.binary
===================================================================
RCS file: /cvsroot/tcl/tcl/win/README.binary,v
retrieving revision 1.35
diff -u -p -r1.35 README.binary
--- win/README.binary 2 Mar 2004 00:42:51 -0000 1.35
+++ win/README.binary 17 Mar 2004 16:00:04 -0000
@@ -13,7 +13,7 @@ Tcl provides a powerful platform for cre
that tie together diverse applications, protocols, devices, and
frameworks. When paired with the Tk toolkit, Tcl provides the fastest
and most powerful way to create GUI applications that run on PCs, Unix,
-and the Macintosh. Tcl can also be used for a variety of web-related
+and Mac OS X. Tcl can also be used for a variety of web-related
tasks and for creating powerful command languages for applications.
Tcl is maintained, enhanced, and distributed freely by the Tcl community.
@@ -76,7 +76,7 @@ our ftp site:
ftp://ftp.scriptics.com/pub/tcl/misc/example.zip
This archive contains a template that you can use for building
-extensions that will be loadable on Unix, Windows, and Macintosh
+extensions that will be loadable on Unix, Windows, and Mac OS X
systems.
6. Reporting Bugs
Index: win/tcl.dsp
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tcl.dsp,v
retrieving revision 1.2
diff -u -p -r1.2 tcl.dsp
--- win/tcl.dsp 10 Nov 2001 04:11:15 -0000 1.2
+++ win/tcl.dsp 17 Mar 2004 16:00:05 -0000
@@ -652,10 +652,6 @@ SOURCE=..\doc\lsort.n
# End Source File
# Begin Source File
-SOURCE=..\doc\Macintosh.3
-# End Source File
-# Begin Source File
-
SOURCE=..\doc\man.macros
# End Source File
# Begin Source File
@@ -780,10 +776,6 @@ SOURCE=..\doc\rename.n
# End Source File
# Begin Source File
-SOURCE=..\doc\resource.n
-# End Source File
-# Begin Source File
-
SOURCE=..\doc\return.n
# End Source File
# Begin Source File
