Fix tests after with_pvm() and with_texmacs() removal. 41/9941/2
Vincent COUVERT [Thu, 6 Dec 2012 16:22:06 +0000 (17:22 +0100)]
test_run("data_structures", "bug_11077")
test_run("completion", "bug_2848")

Change-Id: I47437c5ea1029ae07cf7663e54b15a363c5c7c60

scilab/modules/completion/tests/nonreg_tests/bug_2848.dia.ref
scilab/modules/completion/tests/nonreg_tests/bug_2848.tst
scilab/modules/overloading/macros/%r_p.sci

index 872b1cf..a93f658 100644 (file)
@@ -33,8 +33,6 @@ ref_d = ["with_foo"; ..
          "with_javasci"; ..
          "with_macros_source"; ..
          "with_modelica_compiler"; ..
-         "with_pvm"; ..
-         "with_texmacs"; ..
          "with_tk"];
 assert_checkequal(a, ref_a);
 assert_checkequal(b, ref_b);
index cb45594..0807feb 100644 (file)
@@ -42,8 +42,6 @@ ref_d = ["with_foo"; ..
          "with_javasci"; ..
          "with_macros_source"; ..
          "with_modelica_compiler"; ..
-         "with_pvm"; ..
-         "with_texmacs"; ..
          "with_tk"];
 
 assert_checkequal(a, ref_a);
index 9bac084..412d583 100644 (file)
@@ -1,27 +1,22 @@
 // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 // Copyright (C) INRIA
 // Copyright (C) DIGITEO - 2012 - Allan CORNET
-// 
+//
 // This file must be used under the terms of the CeCILL.
 // This source file is licensed as described in the file COPYING, which
 // you should have received as part of this distribution.  The terms
-// are also available at  
+// are also available at
 // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 
 function %r_p(h)
 
-  w = warning('query');
-  warning('off');
-  wtx = with_texmacs();
-  w = warning(w);
-
-  if wtx then
+  if exists("with_texmacs")==1 & typeof(with_texmacs)=="function" then
     texout(h);
   else
     //used to display rational fraction with complex coefficients
     //The real case is hard coded
     if size(size(h),'*')>2 then
-      //hypermatrix case 
+      //hypermatrix case
       %hmr_p(h)
       return
     end