From 68e3cbe8ff974cb6d5fc014a6ee90bb661a3264d Mon Sep 17 00:00:00 2001 From: Vincent COUVERT Date: Tue, 26 May 2015 16:08:45 +0200 Subject: [PATCH] Adapt test to Scilab 6: - include renamed - function returning nothing called with one output argument. To test: test_run console bug_13226 Change-Id: I34b33fde5f59d6ddf4295615d7e398a60a0c291f --- .../modules/console/tests/nonreg_tests/bug_13226.c | 4 ++-- .../console/tests/nonreg_tests/bug_13226.dia.ref | 5 ++--- .../console/tests/nonreg_tests/bug_13226.tst | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/scilab/modules/console/tests/nonreg_tests/bug_13226.c b/scilab/modules/console/tests/nonreg_tests/bug_13226.c index e1b01ff..765125b 100644 --- a/scilab/modules/console/tests/nonreg_tests/bug_13226.c +++ b/scilab/modules/console/tests/nonreg_tests/bug_13226.c @@ -14,12 +14,12 @@ #include "api_scilab.h" #include "Scierror.h" -#include "MALLOC.h" +#include "sci_malloc.h" extern void autoCompletionInConsoleMode(wchar_t ** commandLine, unsigned int *cursorLocation); /*--------------------------------------------------------------------------*/ -int sci_completecommandline(char *fname, unsigned long fname_len) +int sci_completecommandline(char *fname, void *pvApiCtx) { SciErr err; int * addr = NULL; diff --git a/scilab/modules/console/tests/nonreg_tests/bug_13226.dia.ref b/scilab/modules/console/tests/nonreg_tests/bug_13226.dia.ref index bc95a90..b919aa7 100644 --- a/scilab/modules/console/tests/nonreg_tests/bug_13226.dia.ref +++ b/scilab/modules/console/tests/nonreg_tests/bug_13226.dia.ref @@ -12,7 +12,7 @@ // // <-- Short Description --> // Completion with accentued chars could lead to a a crash -// +// // <-- LINUX ONLY --> file_path = SCI + "/modules/console/tests/nonreg_tests/"; mkdir(TMPDIR + "/console"); @@ -36,9 +36,8 @@ else end // name known in scilab , C function called table = ["completecommandline" ,"sci_completecommandline"]; -libname = ilib_build(ilib_name,table,files,libs,[],"",cflags); +ilib_build(ilib_name,table,files,libs,[],"",cflags); clear ilib_build; -clear libname; clear table; clear libs; clear files; diff --git a/scilab/modules/console/tests/nonreg_tests/bug_13226.tst b/scilab/modules/console/tests/nonreg_tests/bug_13226.tst index 51d53d8..7f85b67 100644 --- a/scilab/modules/console/tests/nonreg_tests/bug_13226.tst +++ b/scilab/modules/console/tests/nonreg_tests/bug_13226.tst @@ -42,10 +42,9 @@ end // name known in scilab , C function called table = ["completecommandline" ,"sci_completecommandline"]; -libname = ilib_build(ilib_name,table,files,libs,[],"",cflags); +ilib_build(ilib_name,table,files,libs,[],"",cflags); clear ilib_build; -clear libname; clear table; clear libs; clear files; -- 1.7.9.5