From c1a380f5489069ea115f2cc598d4addf49c93ed3 Mon Sep 17 00:00:00 2001 From: Vincent COUVERT Date: Wed, 10 Jun 2015 09:42:01 +0200 Subject: [PATCH] * Update Windows ref for atomsShow.tst * Impose English for atomsUpdate.tst Change-Id: Icc84d46611745e6452e197db099aba9a2f508cf0 --- .../atoms/tests/unit_tests/atomsShow.win.dia.ref | 35 +++++++++----------- .../atoms/tests/unit_tests/atomsUpdate.dia.ref | 1 + .../modules/atoms/tests/unit_tests/atomsUpdate.tst | 1 + 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/scilab/modules/atoms/tests/unit_tests/atomsShow.win.dia.ref b/scilab/modules/atoms/tests/unit_tests/atomsShow.win.dia.ref index 7fb66f8..ddd5d00 100644 --- a/scilab/modules/atoms/tests/unit_tests/atomsShow.win.dia.ref +++ b/scilab/modules/atoms/tests/unit_tests/atomsShow.win.dia.ref @@ -15,28 +15,27 @@ atomsSetConfig("autoloadAddAfterInstall","False"); atomsSetConfig("Verbose" ,"False"); // Load the 1st scenario : See scene10.test.atoms.scilab.org.txt // ============================================================================= -atomsRepositorySetOfl("http://scene10.test.atoms.scilab.org"); -Scanning repository http://scene10.test.atoms.scilab.org ... Done - +atomsRepositorySetOfl("http://scene10.6.0.test.atoms.scilab.org"); +Scanning repository http://scene10.6.0.test.atoms.scilab.org ... Done // Install the toolbox 5 // ============================================================================= -atomsInstall("toolbox_3"); -atomsShow("toolbox_3"); - Package : toolbox_3 - Title : Toolbox Test 3 - Summary : To test the Atoms system +atomsInstall("toolbox_3V6"); +atomsShow("toolbox_3V6"); + Package : toolbox_3V6 + Title : Toolbox Test 3 for Scilab 6 + Summary : Toolbox Test 3 for Scilab 6 Version : 1.0-1 - Depend : toolbox_2 (>= 2.0) + Depend : toolbox_2V6 (>= 2.0) Category(ies) : Tests - Author(s) : Pierre MARECHAL - Maintainer(s) : Pierre Marechal - Entity : Digiteo - WebSite : + Author(s) : vincent.couvert@scilab-enterprises.com + Maintainer(s) : Vincent Couvert + Entity : Scilab Enterprises + WebSite : http://forge.scilab.org/index.php/p/atoms-tests/ License : CeCILL - Scilab Version : >= 5.2.0 + Scilab Version : >= 6.0 Status : Installed Automatically Installed : no - Install Directory : SCI\contrib\toolbox_3\1.0-1 + Install Directory : SCI\contrib\toolbox_3V6\1.0-1 Description : Test the Atoms system It contains 4 functions : @@ -44,11 +43,9 @@ Automatically Installed : no - t3_function1() - t3_function2() - t3_function3() - -atomsRemove("toolbox_3"); +atomsRemove("toolbox_3V6"); // Restore original values // ============================================================================= atomsRestoreConfig(%T); atomsRepositorySetOfl(mgetl(SCI+"/modules/atoms/tests/unit_tests/repositories.orig")); -Scanning repository http://atoms.scilab.org/5.5 ... Done - +Scanning repository http://atoms.scilab.org/6.0 ... Done diff --git a/scilab/modules/atoms/tests/unit_tests/atomsUpdate.dia.ref b/scilab/modules/atoms/tests/unit_tests/atomsUpdate.dia.ref index a115770..cfb3a51 100644 --- a/scilab/modules/atoms/tests/unit_tests/atomsUpdate.dia.ref +++ b/scilab/modules/atoms/tests/unit_tests/atomsUpdate.dia.ref @@ -4,6 +4,7 @@ // // This file is distributed under the same license as the Scilab package. // ============================================================================= +// <-- ENGLISH IMPOSED --> // <-- CLI SHELL MODE --> load("SCI/modules/atoms/macros/atoms_internals/lib"); // We need a clean version diff --git a/scilab/modules/atoms/tests/unit_tests/atomsUpdate.tst b/scilab/modules/atoms/tests/unit_tests/atomsUpdate.tst index f85305a..608373d 100644 --- a/scilab/modules/atoms/tests/unit_tests/atomsUpdate.tst +++ b/scilab/modules/atoms/tests/unit_tests/atomsUpdate.tst @@ -5,6 +5,7 @@ // This file is distributed under the same license as the Scilab package. // ============================================================================= +// <-- ENGLISH IMPOSED --> // <-- CLI SHELL MODE --> -- 1.7.9.5