From b4a8155f5bfda1a20becad1cf22a856883d7eea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Charybdis=29?=
 <stephane.adjemian@univ-lemans.fr>
Date: Thu, 4 Jul 2013 11:52:07 +0200
Subject: [PATCH] Adapted mtest routine so that it can be used in the matlab
 routines test suite.

mtest can now return more informations about the unitary tests.
---
 matlab/utilities/tests/mtest.m | 43 +++++++++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/matlab/utilities/tests/mtest.m b/matlab/utilities/tests/mtest.m
index f12e4d9ff..9a51c6746 100644
--- a/matlab/utilities/tests/mtest.m
+++ b/matlab/utilities/tests/mtest.m
@@ -1,7 +1,7 @@
-function check = mtest(fname,fpath)
+function [check, info] = mtest(fname, fpath)
 % Extract test sections from matlab's routine executes the test and report errors.
 
-% Copyright (C) 2011-2012 Dynare Team
+% Copyright (C) 2011-2013 Dynare Team
 %
 % This file is part of Dynare.
 %
@@ -24,7 +24,12 @@ function check = mtest(fname,fpath)
 check = 1;
 
 % Open the matlab file.
-fid = fopen([fpath '/' fname '.m'],'r');
+if isempty(fpath)
+    % The full path to the matlab routine (with extension) is given.
+    fid = fopen(fname,'r');
+else
+    fid = fopen([fpath '/' fname '.m'],'r');
+end
 
 % Read the matlab file.
 file = textscan(fid,'%s','delimiter','\n');
@@ -42,8 +47,22 @@ if length(b1)-length(b2)
     error('test:: There is a problem with the test blocks definition!')
 end
 
+% Initialize the second output if necessary.
+if nargout>1
+    % First column   name of the tested routine.
+    % Second column  number of the unitary test.
+    % Third column   status of the unitary test (0 if the test fails, 1 otherwise)
+    % Fourth column  details about the failure (vector of integers)
+    % Fifth column   elapsed time in seconds (cpu time).
+    info = cell(nn,4);
+end
+
 % Perform the tests.
 for i=1:nn
+    if nargout>1
+        info(i,1) = {fname};
+        info(i,2) = {i};
+    end
     % Write the temporary test routine.
     tid = fopen([fname '_test_' int2str(i) '.m'],'w');
     fprintf(tid,['function [T,t,LOG] = ' fname '_test_' int2str(i) '()\n']);
@@ -60,24 +79,42 @@ for i=1:nn
     fprintf(tid,['end\n']);
     fclose(tid);
     % Call the temporary test routine.
+    init = cputime;
     [TestFlag,TestDetails,LOG] = feval([fname '_test_' int2str(i)]);
+    time = cputime-init;
     if isnan(TestFlag)
         fprintf(['\n'])
         fprintf(['Call to ' fname ' test routine n°' int2str(i) ' failed (' datestr(now) ')!\n'])
         fprintf(['\n'])
         disp(LOG)
         check = 0;
+        if nargout>1
+            info(i,3) = {0};
+        end
         continue
     end
     if ~TestFlag
+        if nargout>1
+            info(i,3) = {0};
+            tmp = ones(length(TestDetails),1);
+        end
         fprintf(['Test n°' int2str(i) ' for routine ' fname ' failed (' datestr(now) ')!\n']);
         for j=1:length(TestDetails)
             if ~TestDetails(j)
+                if nargout>1
+                    tmp(j) = 0;
+                end
                 fprintf(['Output argument n°' int2str(j) ' didn''t give the expected result.\n']);
             end
         end
+        info(i,4) = {tmp};
         check = 0;
     else
+        if nargout>1
+            info(i,3) = {1};
+            info(i,4) = {ones(length(TestDetails),1)};
+            info(i,5) = {time};
+        end
         delete([fname '_test_' int2str(i) '.m'])
     end
 end
\ No newline at end of file