* Bug 16168 fixed: test_run() failed on some Linux install

  http://bugzilla.scilab.org/16168

Change-Id: Idcf5dbba828d7279116ef33bd03739c71956fa7a

diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md
index c46c336..976b77e 100644 (file)
--- a/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@ -272,6 +272,7 @@ Bug Fixes
 * [#16158](http://bugzilla.scilab.org/show_bug.cgi?id=16158): When a multicolumn array of rationals was displayed wide column per column, columns #2:$ were replaced with its column #2.
 * [#16160](http://bugzilla.scilab.org/show_bug.cgi?id=16160): `ppol` changed values of third input variable.
 * [#16164](http://bugzilla.scilab.org/show_bug.cgi?id=16164): Help pages in elementary_functions/signal_processing were mislocated.
+* [#16168](http://bugzilla.scilab.org/show_bug.cgi?id=16168): On some Linux installations, `test_run()` always failed.
 * [#16174](http://bugzilla.scilab.org/show_bug.cgi?id=16174): `libraryinfo` yielded 0x0 matrix of strings for libs without macro
 * [#16177](http://bugzilla.scilab.org/show_bug.cgi?id=16177): In the uicontrol help page, the first example was bugged.
 * [#16178](http://bugzilla.scilab.org/show_bug.cgi?id=16178): `sci2exp` yielded an error for any input macro without output argument.

diff --git a/scilab/modules/development_tools/macros/test_run.sci b/scilab/modules/development_tools/macros/test_run.sci
index fded26a..f8b8d4f 100644 (file)
--- a/scilab/modules/development_tools/macros/test_run.sci
+++ b/scilab/modules/development_tools/macros/test_run.sci
@@ -808,7 +808,8 @@ function status = test_single(_module, _testPath, _testName)
 
     //scilab path
     if (getos() <> "Windows") & ~isfile(SCI+"/bin/scilab") then
-        SCI_BIN = strsubst(SCI,"share/scilab","");
+        // match a string wich finished by /share/scilab/ or /share/scilab
+        SCI_BIN = strsubst(SCI,"|/share/scilab/?$|","","r");
     else
         SCI_BIN = SCI;
     end