Skip to content

Commit 08e04d9

Browse files
author
culler
committed
Constrain send.test tests which are inappropriate for macOS with notAqua.
2 parents e96fc3a + 3be37d2 commit 08e04d9

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

macosx/tkMacOSXSend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ Tk_SendObjCmd(
325325
int objc, /* Number of arguments */
326326
Tcl_Obj *const objv[]) /* The arguments */
327327
{
328-
const char *const sendOptions[] = {"-async", "-displayof", "-", NULL};
328+
const char *const sendOptions[] = {"-async", "-displayof", "--", NULL};
329329
char *stringRep, *destName;
330330
/*int async = 0;*/
331331
int i, index, firstArg;

tests/send.test

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,8 @@ test send-7.4 {Tk_SetAppName procedure, name in use} {secureserver testsend} {
197197
list [tk appname foo] [testsend prop root InterpRegistry]
198198
} "{foo #4} {$commId foo #4\n$id foo\n$id foo #2\n$id foo #3\n}"
199199

200-
test send-8.1 {Tk_SendCmd procedure, options} {secureserver} {
200+
#macOS does not send to other processes
201+
test send-8.1 {Tk_SendCmd procedure, options} {secureserver notAqua} {
201202
setupbg
202203
set app [dobg {tk appname}]
203204
set a 66
@@ -222,10 +223,11 @@ test send-8.2 {Tk_SendCmd procedure, options} {secureserver altDisplay} {
222223
cleanupbg
223224
set result
224225
} {altDisplay homeDisplay}
225-
test send-8.3 {Tk_SendCmd procedure, options} {secureserver} {
226+
# Since macOS has no registry of interpreters, 8.3, 8.4 and 8.10 will fail.
227+
test send-8.3 {Tk_SendCmd procedure, options} {secureserver notAqua} {
226228
list [catch {send -- -async foo bar baz} msg] $msg
227229
} {1 {no application named "-async"}}
228-
test send-8.4 {Tk_SendCmd procedure, options} {secureserver} {
230+
test send-8.4 {Tk_SendCmd procedure, options} {secureserver notAqua} {
229231
list [catch {send -gorp foo bar baz} msg] $msg
230232
} {1 {no application named "-gorp"}}
231233
test send-8.5 {Tk_SendCmd procedure, options} {secureserver} {
@@ -253,7 +255,7 @@ test send-8.9 {Tk_SendCmd procedure, local execution} {secureserver} {
253255
"open bad_file"
254256
invoked from within
255257
"send [tk appname] open bad_file"} {posix enoent {no such file or directory}}}
256-
test send-8.10 {Tk_SendCmd procedure, no such interpreter} {secureserver} {
258+
test send-8.10 {Tk_SendCmd procedure, no such interpreter} {secureserver notAqua} {
257259
list [catch {send bogus_name bogus_command} msg] $msg
258260
} {1 {no application named "bogus_name"}}
259261

@@ -542,7 +544,8 @@ test send-12.1 {TimeoutProc procedure} {secureserver testsend} {
542544

543545
catch {testsend prop root InterpRegistry ""}
544546

545-
test send-12.2 {TimeoutProc procedure} {secureserver} {
547+
#macOS does not send to other processes
548+
test send-12.2 {TimeoutProc procedure} {secureserver notAqua} {
546549
winfo interps
547550
tk appname tktest
548551
update
@@ -557,16 +560,17 @@ test send-12.2 {TimeoutProc procedure} {secureserver} {
557560
set result
558561
} {1 {target application died}}
559562

563+
#macOS does not send to other processes
560564
winfo interps
561565
tk appname tktest
562-
test send-13.1 {DeleteProc procedure} {secureserver} {
566+
test send-13.1 {DeleteProc procedure} {secureserver notAqua} {
563567
setupbg
564568
set app [dobg {rename send {}; tk appname}]
565569
set result [list [catch {send $app foo} msg] $msg [winfo interps]]
566570
cleanupbg
567571
set result
568572
} {1 {no application named "tktest #2"} tktest}
569-
test send-13.2 {DeleteProc procedure} {secureserver} {
573+
test send-13.2 {DeleteProc procedure} {secureserver notAqua} {
570574
winfo interps
571575
tk appname tktest
572576
rename send {}

0 commit comments

Comments
 (0)