Merge 8.6

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/clock.test b/tests/clock.test
index 0b385c9..4a885eb 100644
--- a/tests/clock.test
+++ b/tests/clock.test
@@ -36768,6 +36768,15 @@ test clock-57.1 {clock scan - abbreviated options} {
     clock scan 1970-01-01 -f %Y-%m-%d -g true
 } 0
 
+test clock-57.2 {clock scan - not -gmt and -timezone in the same call} {
+    catch {clock scan 1970-01-01 -format %Y-%m-%d -gmt true -timezone :Europe/Berlin}
+} 1
+
+# Bug af3ebc5fafe009
+test clock-57.3 {clock scan - not -g and -timezone in the same call} {
+    catch {clock scan 1970-01-01 -format %Y-%m-%d -gmt true -timezone :Europe/Berlin}
+} 1
+
 test clock-58.1 {clock l10n - Japanese localisation} {*}{
     -setup {
 	proc backslashify { string } {
@@ -36980,6 +36989,15 @@ test clock-65.1 {clock add, bad option [Bug 2481670]} {*}{
     -result {bad option "-foo"*}
 }
 
+test clock-65.2 {clock add with both -timezone and -gmt} {*}{
+    -body {
+	clock add 0 1 year -timezone :CET -gmt true
+    }
+    -match glob
+    -returnCodes error
+    -result {cannot use -gmt and -timezone in same call}
+}
+
 test clock-66.1 {clock scan, no date, never-before-seen timezone} {*}{
     -setup {
 	::tcl::clock::ClearCaches