Remove old Mac OS X ignored error and replace it by new one (usefull when testing... 02/16902/2
Vincent COUVERT [Mon, 27 Jul 2015 14:01:18 +0000 (16:01 +0200)]
Change-Id: I5971fc78c6845801511df8ce06bed118377bb743

scilab/modules/development_tools/macros/test_run.sci

index b27e553..15fb170 100644 (file)
@@ -848,11 +848,12 @@ function status = test_single(_module, _testPath, _testName)
     if (error_output == "check") & (_module.error_output == "check") then
         if getos() == "Darwin" then
             tmp_errfile_info = fileinfo(tmp_err);
-            msg = "JavaVM: requested Java version (1.5) not available. Using Java at ""/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home"" instead."
+            msg = "Picked up _JAVA_OPTIONS:"; // When -Djava.awt.headless=false is forced for example
 
             if ~isempty(tmp_errfile_info) then
                 txt = mgetl(tmp_err);
-                txt(txt==msg) = [];
+                toRemove = grep(txt, msg);
+                txt(toRemove) = [];
                 if isempty(txt) then
                     deletefile(tmp_err);
                 else // Remove messages due to JOGL2 RC8