Update test+example now libscilab.dll no more exists.

To test: test_run("dynamic_link", "dllinfo");

Change-Id: Ic2b88ca7c589a521a2436ea3ff87499eed57f27d

diff --git a/scilab/modules/dynamic_link/help/en_US/dllinfo.xml b/scilab/modules/dynamic_link/help/en_US/dllinfo.xml
index e2ae1a5..aa1a429 100644 (file)
--- a/scilab/modules/dynamic_link/help/en_US/dllinfo.xml
+++ b/scilab/modules/dynamic_link/help/en_US/dllinfo.xml
@@ -60,20 +60,20 @@
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[ 
-if getos() == 'Windows' then
-  filename = SCI+'\bin\libscilab.dll';
+if getos() == "Windows" then
+  filename = SCI + "\bin\api_scilab.dll";
 
-  dllinfolist = dllinfo(filename,'machine');
-  mprintf('Machine destination of %s: %s\n',dllinfolist(1),dllinfolist(2));
+  dllinfolist = dllinfo(filename, "machine");
+  mprintf("Machine destination of %s: %s\n", dllinfolist(1), dllinfolist(2));
 
-  dllinfolist = dllinfo(filename,'imports');
-  mprintf('Dlls dependencies of %s:\n',filename);
+  dllinfolist = dllinfo(filename, "imports");
+  mprintf("Dlls dependencies of %s:\n", filename);
   for i=1:size(dllinfolist)
-    mprintf('%s\n',dllinfolist(i)(1));
+    mprintf("%s\n",dllinfolist(i)(1));
   end
 
-  dllinfolist = dllinfo(filename,'exports');
-  mprintf('Dll exports of %s:\n',filename);
+  dllinfolist = dllinfo(filename, "exports");
+  mprintf("Dll exports of %s:\n", filename);
   disp(dllinfolist);
 end
  ]]></programlisting>

diff --git a/scilab/modules/dynamic_link/tests/unit_tests/dllinfo.tst b/scilab/modules/dynamic_link/tests/unit_tests/dllinfo.tst
index 6a20d6b..321797f 100644 (file)
--- a/scilab/modules/dynamic_link/tests/unit_tests/dllinfo.tst
+++ b/scilab/modules/dynamic_link/tests/unit_tests/dllinfo.tst
@@ -6,29 +6,26 @@
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 //
+// <-- WINDOWS ONLY -->
+//
 // <-- CLI SHELL MODE -->
 //
-if getos() == 'Windows' then
-  info = dllinfo(SCI+'\bin\scilex.exe','machine');
-  if info(2) <> 'x86' & info(2) <> 'x64' then pause,end
-  
-  info = dllinfo(SCI+'\bin\libscilab.dll','machine');
-  if info(2) <> 'x86' & info(2) <> 'x64' then pause,end
-  
-  info = dllinfo(SCI+'\bin\scilex.exe','exports');
-  if size(info) <> 0 then pause,end
-  
-  info = dllinfo(SCI+'\bin\libscilab.dll','exports');
-  if info(1) <> 'libscilab.dll' then pause,end
-  if size(info(2),'*') < 500 then pause,end
-  if type(info(2)(1)) <> 10 then pause,end
-  
-  info = dllinfo(SCI+'\bin\scilex.exe','imports');
-  if size(info) < 4 then pause,end
-  
-  info = dllinfo(SCI+'\bin\libscilab.dll','imports');
-  if size(info) < 4 then pause,end
-  
-else
-  // nothing to do
-end
+info = dllinfo(SCI + "\bin\scilex.exe", "machine");
+assert_checktrue(or(info(2) == ["x86","x64"]));
+
+info = dllinfo(SCI + "\bin\api_scilab.dll", "machine");
+assert_checktrue(or(info(2) == ["x86","x64"]));
+
+info = dllinfo(SCI + "\bin\scilex.exe", "exports");
+assert_checktrue(size(info) == 0);
+
+info = dllinfo(SCI + "\bin\api_scilab.dll", "exports");
+assert_checkequal(info(1), "api_scilab.dll");
+assert_checktrue(size(info(2), "*") > 300);
+assert_checktrue(typeof(info(2)(1)) == "string");
+
+info = dllinfo(SCI + "\bin\scilex.exe", "imports");
+assert_checktrue(size(info) > 4);
+
+info = dllinfo(SCI + "\bin\api_scilab.dll", "imports");
+assert_checktrue(size(info) > 4);

diff --git a/scilab/modules/dynamic_link/tests/unit_tests/dllinfo.win.dia.ref b/scilab/modules/dynamic_link/tests/unit_tests/dllinfo.win.dia.ref
index 97bd4d6..abb1b07 100644 (file)
--- a/scilab/modules/dynamic_link/tests/unit_tests/dllinfo.win.dia.ref
+++ b/scilab/modules/dynamic_link/tests/unit_tests/dllinfo.win.dia.ref
@@ -6,23 +6,21 @@
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 //
+// <-- WINDOWS ONLY -->
+//
 // <-- CLI SHELL MODE -->
 //
-if getos() == 'Windows' then
-  info = dllinfo(SCI+'\bin\scilex.exe','machine');
-  if info(2) <> 'x86' & info(2) <> 'x64' then bugmes();quit;end
-  info = dllinfo(SCI+'\bin\libscilab.dll','machine');
-  if info(2) <> 'x86' & info(2) <> 'x64' then bugmes();quit;end
-  info = dllinfo(SCI+'\bin\scilex.exe','exports');
-  if size(info) <> 0 then bugmes();quit;end
-  info = dllinfo(SCI+'\bin\libscilab.dll','exports');
-  if info(1) <> 'libscilab.dll' then bugmes();quit;end
-  if size(info(2),'*') < 500 then bugmes();quit;end
-  if type(info(2)(1)) <> 10 then bugmes();quit;end
-  info = dllinfo(SCI+'\bin\scilex.exe','imports');
-  if size(info) < 4 then bugmes();quit;end
-  info = dllinfo(SCI+'\bin\libscilab.dll','imports');
-  if size(info) < 4 then bugmes();quit;end
-else
-  // nothing to do
-end
+info = dllinfo(SCI + "\bin\scilex.exe", "machine");
+assert_checktrue(or(info(2) == ["x86","x64"]));
+info = dllinfo(SCI + "\bin\api_scilab.dll", "machine");
+assert_checktrue(or(info(2) == ["x86","x64"]));
+info = dllinfo(SCI + "\bin\scilex.exe", "exports");
+assert_checktrue(size(info) == 0);
+info = dllinfo(SCI + "\bin\api_scilab.dll", "exports");
+assert_checkequal(info(1), "api_scilab.dll");
+assert_checktrue(size(info(2), "*") > 300);
+assert_checktrue(typeof(info(2)(1)) == "string");
+info = dllinfo(SCI + "\bin\scilex.exe", "imports");
+assert_checktrue(size(info) > 4);
+info = dllinfo(SCI + "\bin\api_scilab.dll", "imports");
+assert_checktrue(size(info) > 4);