From 20bb5669e2dbcd0851b54fb0fc18de1891cc95dc Mon Sep 17 00:00:00 2001
From: fvogel <fvogel@noemail.net>
Date: Tue, 19 Dec 2017 22:35:54 +0000
Subject: Remove constraint tempNotMac on all the tests that used it, it is no
 longer necessary.

FossilOrigin-Name: 7f1a5cc95d8a09ec4c4203b70a4f291a4890533140defa6b0618776c7ddbd4b2
---
 tests/busy.test | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/busy.test b/tests/busy.test
index 304c2eb..cdce30e 100644
--- a/tests/busy.test
+++ b/tests/busy.test
@@ -93,25 +93,25 @@ test busy-2.11 {tk busy hold (shortcut) root window, cursor} -body {
 test busy-2.12 {tk busy hold root window, invalid cursor} -body {
     tk busy hold . -cursor nonExistingCursor
     update
-} -constraints tempNotMac -returnCodes error -cleanup {
+} -returnCodes error -cleanup {
     tk busy forget .
 } -result {bad cursor spec "nonExistingCursor"}
 test busy-2.13 {tk busy hold (shortcut) root window, invalid cursor} -body {
     tk busy . -cursor nonExistingCursor
     update
-} -constraints tempNotMac -returnCodes error -cleanup {
+} -returnCodes error -cleanup {
     tk busy forget .
 } -result {bad cursor spec "nonExistingCursor"}
 test busy-2.14 {tk busy hold root window, invalid option} -body {
     tk busy hold . -invalidOption 1
     update
-} -constraints tempNotMac -returnCodes error -cleanup {
+} -returnCodes error -cleanup {
     tk busy forget .
 } -result {unknown option "-invalidOption"}
 test busy-2.15 {tk busy hold (shortcut) root window, invalid option} -body {
     tk busy . -invalidOption 1
     update
-} -constraints tempNotMac -returnCodes error -cleanup {
+} -returnCodes error -cleanup {
     tk busy forget .
 } -result {unknown option "-invalidOption"}
 
@@ -170,7 +170,7 @@ test busy-3.7 {tk busy cget unix} -setup {
 } -cleanup {
     tk busy forget .f
     destroy .f
-} -result {hand1} -constraints tempNotMac
+} -result {hand1}
 
 test busy-4.1 {tk busy configure no window} -returnCodes error -body {
     tk busy configure
@@ -210,7 +210,7 @@ test busy-4.4-win {tk busy configure} -constraints {win} -setup {
     destroy .f
 } -result {{-cursor cursor Cursor wait wait}}
 
-test busy-4.5 {tk busy configure} -constraints {nonwin tempNotMac} -setup {
+test busy-4.5 {tk busy configure} -constraints {nonwin} -setup {
     pack [frame .f]
     tk busy hold .f -cursor hand2
     update
@@ -266,7 +266,7 @@ test busy-4.7-win {tk busy configure valid option} -constraints {win} -setup {
 } -result {-cursor cursor Cursor wait wait}
 
 test busy-4.8 {tk busy configure valid option} -constraints {
-    nonwin tempNotMac
+    nonwin
 } -setup {
     pack [frame .f]
     tk busy hold .f -cursor circle
@@ -299,7 +299,7 @@ test busy-4.9 {tk busy configure valid option with value} -setup {
 } -cleanup {
     tk busy forget .f
     destroy .f
-} -result {pencil} -constraints tempNotMac
+} -result {pencil}
 
 test busy-4.10 {tk busy configure valid option with invalid value} -setup {
     pack [frame .f]
@@ -307,7 +307,7 @@ test busy-4.10 {tk busy configure valid option with invalid value} -setup {
     update
 } -body {
     tk busy configure .f -cursor nonExistingCursor
-} -constraints tempNotMac -returnCodes error -cleanup {
+} -returnCodes error -cleanup {
     tk busy forget .f
     destroy .f
 } -result {bad cursor spec "nonExistingCursor"}
-- 
cgit v0.12


From 4290a54ed7ea02c82250b961ab1ee6a51679cba2 Mon Sep 17 00:00:00 2001
From: dgp <dgp@noemail.net>
Date: Thu, 21 Dec 2017 19:43:18 +0000
Subject: Distribute *.png files with the test suite.

FossilOrigin-Name: a44c6659c8b7823c8174186ecbafac866619981642f658712c59e774aa8f2811
---
 unix/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unix/Makefile.in b/unix/Makefile.in
index dc5e0e8..edb00b0 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1652,7 +1652,7 @@ dist:   $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(M
 		$(TCLDIR)/doc/man.macros $(DISTDIR)/doc
 	mkdir $(DISTDIR)/tests
 	cp -p $(TOP_DIR)/license.terms $(TEST_DIR)/*.{test,tcl} \
-		$(TEST_DIR)/README $(TEST_DIR)/*.{gif,ppm,xbm} \
+		$(TEST_DIR)/README $(TEST_DIR)/*.{gif,png,ppm,xbm} \
 		$(TEST_DIR)/option.file* $(DISTDIR)/tests
 	mkdir $(DISTDIR)/tests/ttk
 	cp -p $(TEST_DIR)/ttk/*.{test,tcl} $(DISTDIR)/tests/ttk
-- 
cgit v0.12