Fix refs for 'toolbox_skeleton' and 'xcos_toolbox_skeleton', TMPDIR is no more displa...

Ref for 'bug_9339' must be adapted for Windows/Linux since it displays paths.

Change-Id: I50ae53e88ed440b65a5cca829cc247b075458bdf

diff --git a/scilab/modules/modules_manager/tests/nonreg_tests/bug_9339.unix.dia.ref b/scilab/modules/modules_manager/tests/nonreg_tests/bug_9339.unix.dia.ref
new file mode 100644 (file)
index 0000000..6e728eb
--- /dev/null
+++ b/scilab/modules/modules_manager/tests/nonreg_tests/bug_9339.unix.dia.ref
@@ -0,0 +1,47 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2011 - DIGITEO - Allan CORNET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- ENGLISH IMPOSED -->
+//
+// <-- Non-regression test for bug 9339 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=9339
+//
+// <-- Short Description -->
+// 'tbx_build_help' function did not manage languages correctly.
+SRC = SCI + '/contrib/toolbox_skeleton';
+DST = TMPDIR + '/toolbox_skeleton';
+mkdir(DST);
+assert_checkequal(isdir(DST), %T);
+copyfile(SRC, DST);
+cd(DST);
+ilib_verbose(0);
+exec('builder.sce');
+Building macros...
+-- Creation of [toolbox_skeletonlib] (Macros) --
+genlib: Processing file: scilab_sum.sci
+genlib: Regenerate names and lib
+Building sources...
+Building gateway...
+Generating loader_gateway.sce...
+Generating cleaner_gateway.sce...
+Building help...
+
+Building the master document:
+       TMPDIR/toolbox_skeleton/help/en_US
+
+Building the manual file [javaHelp] in TMPDIR/toolbox_skeleton/help/en_US.
+
+Building the master document:
+       TMPDIR/toolbox_skeleton/help/fr_FR
+
+Building the manual file [javaHelp] in TMPDIR/toolbox_skeleton/help/fr_FR.
+Generating loader.sce...
+Generating cleaner.sce...
+assert_checkequal(isdir(DST + '/help/fr_FR/scilab_fr_FR_help'), %T);
+assert_checkequal(isdir(DST + '/help/en_US/scilab_en_US_help'), %T);

diff --git a/scilab/modules/modules_manager/tests/nonreg_tests/bug_9339.dia.ref b/scilab/modules/modules_manager/tests/nonreg_tests/bug_9339.win.dia.ref
similarity index 95%
rename from scilab/modules/modules_manager/tests/nonreg_tests/bug_9339.dia.ref
rename to scilab/modules/modules_manager/tests/nonreg_tests/bug_9339.win.dia.ref
index 5e1ee1a..74f9b2d 100644 (file)
--- a/scilab/modules/modules_manager/tests/nonreg_tests/bug_9339.dia.ref
+++ b/scilab/modules/modules_manager/tests/nonreg_tests/bug_9339.win.dia.ref
@@ -24,6 +24,8 @@ ilib_verbose(0);
 exec('builder.sce');
 Building macros...
 -- Creation of [toolbox_skeletonlib] (Macros) --
+genlib: Processing file: scilab_sum.sci
+genlib: Regenerate names and lib
 Building sources...
 Building gateway...
 Generating loader_gateway.sce...

diff --git a/scilab/modules/modules_manager/tests/unit_tests/toolbox_skeleton.unix.dia.ref b/scilab/modules/modules_manager/tests/unit_tests/toolbox_skeleton.unix.dia.ref
index c742622..eb9816a 100644 (file)
--- a/scilab/modules/modules_manager/tests/unit_tests/toolbox_skeleton.unix.dia.ref
+++ b/scilab/modules/modules_manager/tests/unit_tests/toolbox_skeleton.unix.dia.ref
@@ -89,8 +89,6 @@ Start Toolbox skeleton
        Load help
        Load demos
 test_run("TMPDIR/toolbox_skeleton/", [], "short_summary");
-   TMPDIR = TMPDIR
-
    001/001 - [TMPDIR/toolbox_skeleton/] : 
 
    001/003 - [TMPDIR/toolbox_skeleton/] c_sum...................passed

diff --git a/scilab/modules/modules_manager/tests/unit_tests/xcos_toolbox_skeleton.unix.dia.ref b/scilab/modules/modules_manager/tests/unit_tests/xcos_toolbox_skeleton.unix.dia.ref
index 3d34c75..1aa5ae6 100644 (file)
--- a/scilab/modules/modules_manager/tests/unit_tests/xcos_toolbox_skeleton.unix.dia.ref
+++ b/scilab/modules/modules_manager/tests/unit_tests/xcos_toolbox_skeleton.unix.dia.ref
@@ -60,8 +60,6 @@ Start Xcos toolbox skeleton
        Load help
        Load demos
 test_run("TMPDIR/xcos_toolbox_skeleton/", [], "short_summary");
-   TMPDIR = TMPDIR
-
    001/001 - [TMPDIR/xcos_toolbox_skeleton/] : 
 
    001/001 - [TMPDIR/xcos_toolbox_skeleton/] tbx_sum............passed