* Bug #9008 fixed - test_run applied create_ref option on 'NO CHECK REF' tests

  http://bugzilla.scilab.org/9008

Change-Id: I182eb1805a9ce0cbed74c9aa9a027b779d8e0329

diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md
index c79d0a7..34f14d0 100644 (file)
--- a/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@ -329,6 +329,7 @@ Bug Fixes
 * [#8493](http://bugzilla.scilab.org/show_bug.cgi?id=8493): Some trivial simplifications of `p1./p2` with matrices of complex-encoded polynomials were not done.
 * [#8841](http://bugzilla.scilab.org/show_bug.cgi?id=8841): Error in struct extraction, s.a is not equal to s(1).a
 * [#8938](http://bugzilla.scilab.org/show_bug.cgi?id=8938): In a boolean sparse matrix `sp`, distributive insertions like `sp(1,:)=%t`, `sp(1,1:$)=%t` or `sp(:,:)=%t` yielded an error.
+* [#9008](http://bugzilla.scilab.org/show_bug.cgi?id=9008): `test_run` applied the `create_ref` option even for tests having the `<-- NO CHECK REF -->` flag.
 * [#9153](http://bugzilla.scilab.org/show_bug.cgi?id=9153): The `isqualbitwise` help page was inaccurate and badly located
 * [#9161](http://bugzilla.scilab.org/show_bug.cgi?id=9161): Multiple insertions at a repeated index in a sparse matrice wrongly updated it.
 * [#9865](http://bugzilla.scilab.org/show_bug.cgi?id=9865): When making a plot with `point`(no line), no symbol was shown in the legend.

diff --git a/scilab/modules/development_tools/help/en_US/test_run.xml b/scilab/modules/development_tools/help/en_US/test_run.xml
index 5dc6ffb..76f3c9e 100644 (file)
--- a/scilab/modules/development_tools/help/en_US/test_run.xml
+++ b/scilab/modules/development_tools/help/en_US/test_run.xml
@@ -91,7 +91,10 @@
                         <varlistentry>
                             <term>"create_ref"</term>
                             <listitem>
-                                <para>create the .dia.ref file and does not check if the .dia and .dia.ref are equal</para>
+                                <para>creates the .dia.ref file (for tests not having the
+                                  <literal>&lt;-- NO CHECK REF --></literal> flag)
+                                  and does not check if the .dia and .dia.ref are equal.
+                                  </para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>

diff --git a/scilab/modules/development_tools/help/fr_FR/test_run.xml b/scilab/modules/development_tools/help/fr_FR/test_run.xml
index fd113c3..736a3ff 100644 (file)
--- a/scilab/modules/development_tools/help/fr_FR/test_run.xml
+++ b/scilab/modules/development_tools/help/fr_FR/test_run.xml
@@ -89,7 +89,9 @@
                         <varlistentry>
                             <term>"create_ref"</term>
                             <listitem>
-                                <para>génère un fichier .dia.ref (ignore la comparaison avec tout précédent fichier .dia.ref)</para>
+                                <para>génère un fichier .dia.ref (pour les tests sans l'indicateur
+                                  <literal>&lt;-- NO CHECK REF --></literal>), et ignore la comparaison
+                                  avec tout précédent fichier .dia.ref</para>
                             </listitem>
                         </varlistentry>
                         <varlistentry>

diff --git a/scilab/modules/development_tools/help/ja_JP/test_run.xml b/scilab/modules/development_tools/help/ja_JP/test_run.xml
index f4cca92..ce6fca6 100644 (file)
--- a/scilab/modules/development_tools/help/ja_JP/test_run.xml
+++ b/scilab/modules/development_tools/help/ja_JP/test_run.xml
@@ -87,6 +87,8 @@
                             <listitem>
                                 <para>.dia.refファイルを作成し,
                                     .dia と .dia.refが等しいかどうかをチェックしません.
+                                  This option is applied only to chosen tests not having the
+                                  <literal>&lt;-- NO CHECK REF --></literal> flag.
                                 </para>
                             </listitem>
                         </varlistentry>

diff --git a/scilab/modules/development_tools/macros/test_run.sci b/scilab/modules/development_tools/macros/test_run.sci
index 45350e7..40901ae 100644 (file)
--- a/scilab/modules/development_tools/macros/test_run.sci
+++ b/scilab/modules/development_tools/macros/test_run.sci
@@ -1014,7 +1014,6 @@ function status = test_single(_module, _testPath, _testName)
         if params.show_error == %t then
             status.details = [ status.details; dia($-10:$) ]
         end
-
         return;
     end
 
@@ -1084,7 +1083,8 @@ function status = test_single(_module, _testPath, _testName)
 
     // Comparaison ref <--> dia
 
-    if ( (reference=="check") & (_module.reference=="check") ) | (_module.reference=="create") then
+    if   (reference=="check" & _module.reference=="check") | ..
+         (reference ~= "skip" & _module.reference=="create") then
         //  Do some modification in  dia file
 
         dia(grep(dia, "printf(''%s\n'',tmpdirToPrint);")) = [];

diff --git a/scilab/modules/development_tools/tests/nonreg_tests/bug_9008.tst b/scilab/modules/development_tools/tests/nonreg_tests/bug_9008.tst
new file mode 100644 (file)
index 0000000..9eca6a2
--- /dev/null
+++ b/scilab/modules/development_tools/tests/nonreg_tests/bug_9008.tst
@@ -0,0 +1,21 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2016 - Samuel GOUGEON
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- INTERACTIVE TEST -->
+//
+// <-- Non-regression test for bug 9008 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/9008
+//
+// <-- Short Description -->
+// test_run() applied the create_ref option even on tests having the <-- NO CHECK REF --> header
+//
+
+test_run("polynomials", "bug_415", "create_ref"); //
+// Bugged  :    001/001 - [polynomials] bug_415..............................passed: ref created
+// Expected:    001/001 - [polynomials] bug_415..............................passed