fix console interactive tests

Change-Id: Idfe575ef00265d480e41616ad41bfce922cfbbf2

diff --git a/scilab/modules/console/etc/XConfiguration-general.xml b/scilab/modules/console/etc/XConfiguration-general.xml
index 295903d..bae1f4e 100644 (file)
--- a/scilab/modules/console/etc/XConfiguration-general.xml
+++ b/scilab/modules/console/etc/XConfiguration-general.xml
@@ -58,7 +58,7 @@
                     <action key="OSSCKEY H" description="_(Delete previous char)" name="console-del-prev-char"/>
                     <action key="OSSCKEY K" description="_(Delete end of line)" name="console-del-end-line"/>
                     <action key="OSSCKEY U" description="_(Delete whole line)" name="console-del-whole-line"/>
-                    <action key="OSSCKEY ESCAPE" description="_(Delete whole line)" name="console-del-whole-line"/>
+                    <action key="ESCAPE" description="_(Delete whole line)" name="console-del-whole-line"/>
                     <action key="OSSCKEY W" description="_(Delete last word)" name="console-del-last-word"/>
                     <action key="PAGE_UP" description="_(Previous console page)" name="console-prev-page"/>
                     <action key="PAGE_DOWN" description="_(Next console page)" name="console-next-page"/>

diff --git a/scilab/modules/console/src/c/windows/TermLine.c b/scilab/modules/console/src/c/windows/TermLine.c
index aa7179c..554dad9 100644 (file)
--- a/scilab/modules/console/src/c/windows/TermLine.c
+++ b/scilab/modules/console/src/c/windows/TermLine.c
@@ -448,7 +448,6 @@ char *getLineAfterCaret(void)
     if (cur_pos != max_pos)
     {
         line = os_strdup(&cur_line[cur_pos]);
-        line[(max_pos - cur_pos) + 1] = '\0';
     }
     else
     {

diff --git a/scilab/modules/console/tests/nonreg_tests/bug_7568.tst b/scilab/modules/console/tests/nonreg_tests/bug_7568.tst
index 7716c91..9e8727e 100644 (file)
--- a/scilab/modules/console/tests/nonreg_tests/bug_7568.tst
+++ b/scilab/modules/console/tests/nonreg_tests/bug_7568.tst
@@ -7,6 +7,7 @@
 
 // <-- INTERACTIVE TEST -->
 // <-- TEST WITH CONSOLE -->
+// <-- LINUX ONLY -->
 //
 // <-- Non-regression test for bug 7568 -->
 //

diff --git a/scilab/modules/console/tests/nonreg_tests/bug_7625.tst b/scilab/modules/console/tests/nonreg_tests/bug_7625.tst
index 1b2b274..26f31b6 100644 (file)
--- a/scilab/modules/console/tests/nonreg_tests/bug_7625.tst
+++ b/scilab/modules/console/tests/nonreg_tests/bug_7625.tst
@@ -7,6 +7,7 @@
 
 // <-- INTERACTIVE TEST -->
 // <-- TEST WITH CONSOLE -->
+// <-- LINUX ONLY -->
 //
 // <-- Non-regression test for bug 7625 -->
 //

diff --git a/scilab/modules/console/tests/nonreg_tests/bug_9082.tst b/scilab/modules/console/tests/nonreg_tests/bug_9082.tst
index d0dccb4..2d16753 100644 (file)
--- a/scilab/modules/console/tests/nonreg_tests/bug_9082.tst
+++ b/scilab/modules/console/tests/nonreg_tests/bug_9082.tst
@@ -16,7 +16,7 @@
 // <-- Short Description -->
 // It was not possible to preview LaTeX when it was a second LaTeX string.
 
-a=["$\frac\pi2$"; "$\int_0^\inftyf(x)\mathrm{d}x$"];
+a=["$\frac\pi2$"; "$\int_0^\infty f(x)\mathrm{d}x$"];
 
 // Move the caret on the first and on the second LaTeX string
 // The LaTeX preview should be active on the two strings.
\ No newline at end of file