Merge branch 'master' into 356_loadsave_code

pace-neutrons · Oct 20, 2021 · c8a1b2b · c8a1b2b
2 parents 26ad4d3 + 9c8d768
commit c8a1b2b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/_test/CMakeLists.txt b/_test/CMakeLists.txt
@@ -4,7 +4,6 @@ set(TEST_DIRECTORIES
     "test_IX_classes"
     "test_map_mask"
     "test_multifit"
-    "test_multifit_legacy"
     "test_utilities"
     "test_instrument_classes"
     "test_docify"

diff --git a/_test/disabled_tests.md b/_test/disabled_tests.md
@@ -13,4 +13,6 @@
         :test_job_fail_restart
 
 - test_ParpoolMPI_Framework 
-    - test_finish_tasks_reduce_messages Disabled on Windows Jenkins Matlab 2018b only due to launch instability (rare 1/10)
+    - test_finish_tasks_reduce_messages Disabled on Windows Jenkins Matlab 2018b only due to launch instability (rare 1/10)
+
+- test_multifit_legacy  -- fully disabled due to deprecating the code and the changes according to ticket #392
diff --git a/_test/shared/matlab_xunit_ISISextras/@TestCaseWithSave/save.m b/_test/shared/matlab_xunit_ISISextras/@TestCaseWithSave/save.m
@@ -35,7 +35,18 @@ function save (this)
 for i=1:numel(test_methods)
     fhandle=@(x)this.(test_methods{i});
     this.setUp();   % ensure any setup method is called
-    fhandle(this);
+    try
+        fhandle(this);
+    catch ME
+        switch (ME.identifier)
+          case 'testSkipped:testSkipped'
+            if hc.log_level>-1
+                disp(['Skipping test: ', test_methods{i}])
+            end
+          otherwise
+            rethrow(ME)
+        end
+    end
     this.tearDown();% ensure any teardown method is called
 end
 
@@ -60,13 +71,13 @@ function save (this)
                 ' Can only add or replace test data in a pre-existing test results file')
         end
     end
-    
+
     if hc.log_level>-1
         disp(' ')
         disp(['Output saved to: ',this.test_results_file_])
         disp(' ')
     end
-    
+
 else
     % No data to be saved
     if hc.log_level>-1

diff --git a/admin/validate_herbert.m b/admin/validate_herbert.m
@@ -56,7 +56,6 @@
         'test_docify', ...
         'test_admin', ...
         'test_multifit', ...
-        'test_multifit_legacy', ...
         'test_mpi_wrappers', ...
         'test_mpi', ...
         'test_xunit_framework', ...

diff --git a/cmake/shared/PACE_CodeAnalysis.cmake b/cmake/shared/PACE_CodeAnalysis.cmake
@@ -54,8 +54,6 @@ string(CONCAT RUN_MLINT "\""
                         "exit;"
                         "\"")
 
-message(${RUN_MLINT})
-
 add_custom_target(analyse-mlint
   COMMENT "- Performing MATLAB analysis (Mlint)..."
   BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/mlint.out"

diff --git a/herbert_core/applications/multifit_legacy/multifit_legacy.m b/herbert_core/applications/multifit_legacy/multifit_legacy.m
@@ -769,7 +769,7 @@
 %
 % $Revision:: 840 ($Date:: 2020-02-10 16:05:56 +0000 (Mon, 10 Feb 2020) $)
 
-
+error('HERBERT:multifit_legacy:deprecated', 'This routine has been deprecated and should no longer be used. See: multifit')
 [ok,mess,wout,fitdata] = multifit_gateway_main (varargin{:});
 if ~ok && nargout<3
     error(mess)