Cmake key-tests: These are very touchy in respect to timings

Cmake key-tests: These are very touchy in respect to timings

1.) Try to use shortcuts instead of direct command
2.) use bigger pause where needed

diff --git a/development/autotests/findadv-09-in.txt b/development/autotests/findadv-09-in.txt
index 684076f63597180abd426861efb3443bcdd92eb9..b5a9b17d45fedf990a8db5959fcb28585f3fe937 100644 (file)
--- a/development/autotests/findadv-09-in.txt
+++ b/development/autotests/findadv-09-in.txt
@@ -1,5 +1,6 @@
 # Test for searching with regular expressions
 UseShortcut "C-F30" "layout Itemize"
+UseShortcut "C-F20" "regexp-mode"
 
 PrepareShortcuts
 
@@ -14,7 +15,7 @@ KK: \CF
 KK: \At\Ai\Ah
 KK: \CF
 KK: \C\[F30]
-KK: \Axregexp-mode\[Return][a-z]* \[Return]
+KK: \C\[F20][a-z]* \[Return]
 CP: Putting selection at .*idx: 0 par: 0 pos: 0\n with len: 3
 
 CN: Part 2
@@ -26,7 +27,7 @@ KK: \[Delete]
 #KK: \At\Ai\Ah
 #KK: \CF
 KK: \C\[F30]
-KK: \Axregexp-mode\[Return][a-z]* \[Return]\[Return]
+KK: \C\[F20][a-z]* \[Return]\[Return]
 CP: Putting selection at .*idx: 0 par: 0 pos: 0\n with len: 3
 CP: Putting selection at .*idx: 0 par: 1 pos: 0\n with len: 3
 TestEnd

diff --git a/development/autotests/findadv-18-in.txt b/development/autotests/findadv-18-in.txt
index 3f007c5d123d760ed2f129ffab1e252530b5a204..61ec67daac1c13f9bd946e4daf6de2abd363f50a 100644 (file)
--- a/development/autotests/findadv-18-in.txt
+++ b/development/autotests/findadv-18-in.txt
@@ -1,4 +1,6 @@
 # Searching for regexp with e.g. \[Backspace]\[Backspace]s finds blanks
+UseShortcut "C-F20" "regexp-mode"
+PrepareShortcuts
 
 Lang it_IT.utf8
 CO: findadv-18.ctrl
@@ -6,7 +8,7 @@ TestBegin test.lyx -dbg key,find > findadv-18.loga.txt 2>&1
 KK: a b c\C\[Home]
 KK: \Cs
 KK: \CF
-KK: \Axregexp-mode\[Return]\\s\[Return]
+KK: \C\[F20]\\s\[Return]
 CP: Putting selection at .*idx: 0 par: 0 pos: 1\n with len: 1
 TestEnd
 Lang C

diff --git a/development/autotests/findadv-19-in.txt b/development/autotests/findadv-19-in.txt
index a4b29926b8de440c1b49a0b312dfec8d06b81541..0e727e060585f4b8382e0bc224cabe15fe6769f7 100644 (file)
--- a/development/autotests/findadv-19-in.txt
+++ b/development/autotests/findadv-19-in.txt
@@ -1,4 +1,6 @@
 # Check that searching for regexp "([a-z]+)\s\1" finds duplicate words.
+UseShortcut "C-F20" "regexp-mode"
+PrepareShortcuts
 
 Lang it_IT.utf8
 CO: findadv-19.ctrl
@@ -7,7 +9,7 @@ KD: 50
 KK: Hello world world!\C\[Home]
 KK: \Cs
 KK: \CF
-KK: \Axregexp-mode\[Return]([a-z]+)\\s\\1\[Return]
+KK: \C\[F20]([a-z]+)\\s\\1\[Return]
 CP: Putting selection at .*idx: 0 par: 0 pos: 6\n with len: 11
 Sleep 1
 TestEnd

diff --git a/development/autotests/findadv-20-in.txt b/development/autotests/findadv-20-in.txt
index 345e7755a0bdd3f8d1a5d570bc4fac8495d36955..744dcae95b5b6e26600b271baf671362dbe273cd 100644 (file)
--- a/development/autotests/findadv-20-in.txt
+++ b/development/autotests/findadv-20-in.txt
@@ -1,11 +1,13 @@
 # Avoiding recursive replacements when replaced text matches search pattern
 # Addresses #7675.
 #
+
 Lang it_IT.utf8
 
 CO: findadv-20.1.ctrl
 TestBegin test.lyx -dbg key,find > findadv-20.loga.txt 2>&1
 CN: Part 1
+KD: 100
 KK: a a a\C\[Home]
 KK: \CF
 KK: a\[Tab]
@@ -20,6 +22,7 @@ Lang it_IT.utf8
 CO: findadv-20.2.ctrl
 TestBegin test2.lyx -dbg key,find > findadv-20.logb.txt 2>&1
 CN: Part 2
+KD: 100
 KK: \Cma  \Cma  \Cma \C\[Home]
 KK: \CF
 KK: a\[Tab]

diff --git a/development/autotests/findadv-21-in.txt b/development/autotests/findadv-21-in.txt
index f2512d53b7ecbf3076037a1f4cbe83b73149ce98..1c851e8accb68a5c71e5e993f91edd711b26cfdd 100644 (file)
--- a/development/autotests/findadv-21-in.txt
+++ b/development/autotests/findadv-21-in.txt
@@ -1,5 +1,7 @@
 # Test for searching with regular expressions
 # Test for #8381
+UseShortcut "C-F20" "regexp-mode"
+PrepareShortcuts
 
 Lang sk_SK.utf8
 CO: findadv-21.ctrl
@@ -24,7 +26,7 @@ KK: \CF
 KK: \At\Ai\Ah
 KK: \CF
 KK: \Aoe
-KK: \Axregexp-mode\[Return][a-z]* \[Return]\[Return]
+KK: \C\[F20][a-z]* \[Return]\[Return]
 Cr: ^.*Putting
 #Cr: ^.*action=buffer-begin
 CP: Putting selection at cur= inset: .* idx: 0 par: 3 pos: 0\n with len: 4
@@ -39,7 +41,7 @@ KK: \CF\[Delete]
 #KK: \At\Ai\Ah
 #KK: \CF
 KK: \Aol
-KK: \Axregexp-mode\[Return][a-z]2  \Axregexp-mode\[Return][a-z]+
+KK: \C\[F20][a-z]2  \C\[F20][a-z]+
 KK: \[Return]\[Return]\[Return]\[Return]\[Return]\[Return]
 Cr: ^.*Putting
 CP: Putting selection at cur= inset: .* idx: 0 par: 6 pos: 0\n with len: 8

diff --git a/development/autotests/findadv-re-01-in.txt b/development/autotests/findadv-re-01-in.txt
index 667b77c61c85670d554a38319a1eabd988397176..034e1a0b483cae14f0339307b1658e3befacaf72 100644 (file)
--- a/development/autotests/findadv-re-01-in.txt
+++ b/development/autotests/findadv-re-01-in.txt
@@ -1,5 +1,8 @@
 # Finding special latex/regexp chars: (
 #
+UseShortcut "C-F20" "regexp-mode"
+PrepareShortcuts
+
 Lang it_IT.utf8
 KD: 100
 CO: findadv-re-01.ctrl
@@ -8,7 +11,7 @@ CN: Part 1
 KK: \\()[]{}%^#@?*.\C\[Home]
 KK: \Cs
 KK: \CF
-KK: \Axregexp-mode\[Return]\\(\[Return]
+KK: \C\[F20]\\(\[Return]
 CP: Putting selection at .*idx: 0 par: 0 pos: 1\n with len: 1
 TestEnd
 #
@@ -20,7 +23,7 @@ KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
 KK: \CF
-KK: \Axregexp-mode\[Return]\\(\[Return]
+KK: \C\[F20]\\(\[Return]
 CP: Putting selection at .*idx: 0 par: 0 pos: 1\n with len: 1
 TestEnd
 
@@ -31,7 +34,7 @@ CO: >> findadv-re-01.ctrl
 TestBegin test.lyx -dbg key,find >> findadv-re-01.loga.txt 2>&1
 CN: Part 3
 KK: \CF
-KK: \Axregexp-mode\[Return]\\[\[Return]
+KK: \C\[F20]\\[\[Return]
 CP: Putting selection at .*idx: 0 par: 0 pos: 3\n with len: 1
 TestEnd
 #
@@ -43,7 +46,7 @@ KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
 KK: \CF
-KK: \Axregexp-mode\[Return]\\[\[Return]
+KK: \C\[F20]\\[\[Return]
 CP: Putting selection at .*idx: 0 par: 0 pos: 3\n with len: 1
 TestEnd
 Lang C

diff --git a/development/autotests/findadv-re-02-in.txt b/development/autotests/findadv-re-02-in.txt
index e82549aa1139953f8e33a66b949561e1cbad96f1..66ade28c2dbff3f6cf15067ebbed8733d2995dd5 100644 (file)
--- a/development/autotests/findadv-re-02-in.txt
+++ b/development/autotests/findadv-re-02-in.txt
@@ -1,5 +1,8 @@
 # Finding special latex/regexp chars: \
 #
+UseShortcut "C-F20" "regexp-mode"
+PrepareShortcuts
+
 Lang it_IT.utf8
 CO: findadv-re-02.ctrl
 TestBegin test.lyx -dbg key,find > findadv-re-02.loga.txt 2>&1
@@ -7,7 +10,7 @@ CN: Part 1
 KK: \\()[]{}%^#@?*.\C\[Home]
 KK: \Cs
 KK: \CF
-KK: \Axregexp-mode\[Return]\\\\\[Return]
+KK: \C\[F20]\\\\\[Return]
 CP: Putting selection at .*idx: 0 par: 0 pos: 0\n with len: 1
 TestEnd
 #
@@ -19,7 +22,7 @@ KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
 KK: \CF
-KK: \Axregexp-mode\[Return]\\\\\[Return]
+KK: \C\[F20]\\\\\[Return]
 CP: Putting selection at .*idx: 0 par: 0 pos: 0\n with len: 1
 TestEnd
 
@@ -30,7 +33,7 @@ TestBegin test.lyx -dbg key,find >> findadv-re-02.loga.txt 2>&1
 CN: Part 3
 CO: >> findadv-re-02.ctrl
 KK: \CF
-KK: \Axregexp-mode\[Return]%\[Return]
+KK: \C\[F20]%\[Return]
 CP: Putting selection at .*idx: 0 par: 0 pos: 7\n with len: 1
 TestEnd
 #
@@ -42,7 +45,7 @@ KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
 KK: \CF
-KK: \Axregexp-mode\[Return]%\[Return]
+KK: \C\[F20]%\[Return]
 CP: Putting selection at .*idx: 0 par: 0 pos: 7\n with len: 1
 TestEnd
 
@@ -53,7 +56,7 @@ CO: >> findadv-re-02.ctrl
 TestBegin test.lyx -dbg key,find >> findadv-re-02.loga.txt 2>&1
 CN: Part 5
 KK: \CF
-KK: \Axregexp-mode\[Return]\\^\[Return]
+KK: \C\[F20]\\^\[Return]
 CP: Putting selection at .*idx: 0 par: 0 pos: 8\n with len: 1
 TestEnd
 #
@@ -65,7 +68,7 @@ KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
 KK: \CF
-KK: \Axregexp-mode\[Return]\\^\[Return]
+KK: \C\[F20]\\^\[Return]
 CP: Putting selection at .*idx: 0 par: 0 pos: 8\n with len: 1
 TestEnd
 Lang C

diff --git a/development/autotests/findadv-re-03-in.txt b/development/autotests/findadv-re-03-in.txt
index 26dec197d96dbc0a0453ca23933536004e5cc6c5..020f50a0169bb1c5bfb691685006da90c59efc9e 100644 (file)
--- a/development/autotests/findadv-re-03-in.txt
+++ b/development/autotests/findadv-re-03-in.txt
@@ -1,5 +1,8 @@
 # Finding special latex/regexp chars: {
 #
+UseShortcut "C-F20" "regexp-mode"
+PrepareShortcuts
+
 Lang it_IT.utf8
 CO: findadv-re-03.ctrl
 TestBegin test.lyx -dbg key,find > findadv-re-03.loga.txt 2>&1
@@ -7,7 +10,7 @@ CN: Part 1
 KK: \\()[]{}%^#@?*.\C\[Home]
 KK: \Cs
 KK: \CF
-KK: \Axregexp-mode\[Return]\\{\[Return]
+KK: \C\[F20]\\{\[Return]
 CP: Putting selection at .*idx: 0 par: 0 pos: 5\n with len: 1
 TestEnd
 #
@@ -19,7 +22,7 @@ KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
 KK: \CF
-KK: \Axregexp-mode\[Return]\\{\[Return]
+KK: \C\[F20]\\{\[Return]
 CP: Putting selection at .*idx: 0 par: 0 pos: 5\n with len: 1
 TestEnd
 #
@@ -30,7 +33,7 @@ CO: >> findadv-re-03.ctrl
 TestBegin test.lyx -dbg key,find >> findadv-re-03.loga.txt 2>&1
 CN: Part 3
 KK: \CF
-KK: \Axregexp-mode\[Return]\\}\[Return]
+KK: \C\[F20]\\}\[Return]
 CP: Putting selection at .*idx: 0 par: 0 pos: 6\n with len: 1
 TestEnd
 #
@@ -42,7 +45,7 @@ KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
 KK: \CF
-KK: \Axregexp-mode\[Return]\\}\[Return]
+KK: \C\[F20]\\}\[Return]
 CP: Putting selection at .*idx: 0 par: 0 pos: 6\n with len: 1
 Sleep 1
 TestEnd

diff --git a/development/autotests/findadv-re-04-in.txt b/development/autotests/findadv-re-04-in.txt
index 1b35ef39c013338472034812d0717ffabb1dcfca..e18d5aa2928c574c09619c8315689b5a550918b0 100644 (file)
--- a/development/autotests/findadv-re-04-in.txt
+++ b/development/autotests/findadv-re-04-in.txt
@@ -1,4 +1,6 @@
 # Finding styles with regexp
+UseShortcut "C-F20" "regexp-mode"
+PrepareShortcuts
 
 Lang sk_SK.utf8
 CO: findadv-re-04.ctrl
@@ -16,7 +18,7 @@ KK: \At\Ai\Ah
 KK: \CF
 KK: \Ce
 CN: Case insensitive, format not ignored .*
-KK: \Axregexp-mode\[Return].*\[Return]
+KK: \C\[F20].*\[Return]
 Cr: ^.*Putting 
 CP: Putting selection at .*idx: 0 par: 0 pos: 16\n with len: 9
 Cr: ^.*Putting 
@@ -32,7 +34,7 @@ KK: \CF
 KK: \At\Ai\Ah
 KK: \CF
 KK: \Ce
-KK: \Axregexp-mode\[Return]\\b[a-z]*\\b\[Return]\[Return]\[Return]
+KK: \C\[F20]\\b[a-z]*\\b\[Return]\[Return]\[Return]
 Cr: ^.*Putting 
 CP: Putting selection at .*idx: 0 par: 0 pos: 16\n with len: 3
 Cr: ^.*Putting 
@@ -50,7 +52,7 @@ KK: \CF
 KK: \At\Ai\Ah
 KK: \CF
 KK: \Ce
-KK: \Az\[Tab]\Axregexp-mode\[Return][a-z]+\[Return]\[Return]\[Return]\[Return]
+KK: \Az\[Tab]\C\[F20][a-z]+\[Return]\[Return]\[Return]\[Return]
 Cr: ^.*Putting
 CP: Putting selection at .*idx: 0 par: 0 pos: 17\n with len: 2
 Cr: ^.*Putting
@@ -72,7 +74,7 @@ KK: \CF
 KK: \At\Ai\Ah
 KK: \CF
 KK: \Ce
-KK: \Az\[Tab]\Axregexp-mode\[Return][A-Z]+\[Return]\[Return]\[Return]
+KK: \Az\[Tab]\C\[F20][A-Z]+\[Return]\[Return]\[Return]
 Cr: ^.*Putting
 CP: Putting selection at .*idx: 0 par: 0 pos: 16\n with len: 1
 Cr: ^.*Putting

diff --git a/development/autotests/findadv-re-05-in.txt b/development/autotests/findadv-re-05-in.txt
index d5433d9559da9c2e7cbde091f8a53a0a24e7c598..e89ce9e11ac45815363d4ef09c624cbba5e0bfb2 100644 (file)
--- a/development/autotests/findadv-re-05-in.txt
+++ b/development/autotests/findadv-re-05-in.txt
@@ -7,13 +7,16 @@
 # It will fail if the Italian translation changes, if "ignore format" is
 # unchecked by default, or if the wrap-around mechanism changes (e.g. does not
 # ask if the cursor started at the beginning of the buffer).
+UseShortcut "C-F20" "regexp-mode"
+PrepareShortcuts
 
 Lang it_IT.utf8
 CO: findadv-re-05.ctrl
 TestBegin test.lyx -dbg key,find > findadv-re-05.loga.txt 2>&1
 KK: \Cm\\frac 1-x\[Down]1+x^2 \C\[Home]
 KK: \CF
-KK: \Cm\\frac \Axregexp-mode\[Return].* \[Down]1+x^2 \[Return]
+KK: \Cm\\frac \C\[F20].* \[Down]1+x^2 \[Return]\[Return]
+CP: Putting selection at .*idx: 0 par: 0 pos: 0\n .*idx: 0 par: 0 pos: 0\n with len: 1
 CP: raggiunta la fine cercando in avanti
 TestEnd
 Lang C

diff --git a/development/autotests/findadv-re-06-in.txt b/development/autotests/findadv-re-06-in.txt
index 9379da0de77676eec4673fda9c4939dc3ba92e34..1050ef9c54770f288090935927604aef1612cb7c 100644 (file)
--- a/development/autotests/findadv-re-06-in.txt
+++ b/development/autotests/findadv-re-06-in.txt
@@ -1,4 +1,6 @@
 # Finding regexps within \frac{}
+UseShortcut "C-F20" "regexp-mode"
+PrepareShortcuts
 
 Lang sk_SK.utf8
 CO: findadv-re-06.ctrl
@@ -9,7 +11,7 @@ KK: \CF
 # Uncheck ignore format (depends on IT language)
 KK: \At\Ai\Ah
 KK: \CF
-KK: \Cm\\frac \Axregexp-mode\[Return].* \[Down]1+x^2 \[Return]
+KK: \Cm\\frac \C\[F20].* \[Down]1+x^2 \[Return]
 CP: Putting selection at .*idx: 0 par: 0 pos: 0\n .*idx: 0 par: 0 pos: 0\n with len: 1
 TestEnd
 Lang C