wrapper matlab test

misc/test/CMakeLists.txt

@@ -95,7 +95,7 @@ if(BUILD_WRAPPER_MATLAB)
 		
 		#test Faust with 1 factor : 
 		# 1st factor sparse size 10x3, 		
-		add_test(NAME MATLAB_FAUST_CONFIG3 COMMAND matlab -nojvm -r "try;testpass=0;addpath('${FAUST_BIN_TEST_BIN_DIR}','${FAUST_BIN_TEST_TOOLS_DIR}');set_path;[factors,prod]=generate_Faust_config([100,10],{'sparse'});test_matlab_faust(factors,prod,1000,0);catch ME ;testpass=-1;disp(getReport(ME)); end ; exit(testpass)")
+		add_test(NAME MATLAB_FAUST_CONFIG4 COMMAND matlab -nojvm -r "try;testpass=0;addpath('${FAUST_BIN_TEST_BIN_DIR}','${FAUST_BIN_TEST_TOOLS_DIR}');set_path;[factors,prod]=generate_Faust_config([100,10],{'sparse'});test_matlab_faust(factors,prod,1000,0);catch ME ;testpass=-1;disp(getReport(ME)); end ; exit(testpass)")
 
 
 

misc/test/src/test_matlab_faust.m

@@ -562,14 +562,14 @@ if (nb_fact_load ~= nb_fact)
 	error('load and save faust : invalid number of factor of the loaded faust ');
 end
 
-%{for i=1:nb_fact
+for i=1:nb_fact
 	A=get_fact(F_loaded,i);
 	if(~isequal(A,factors{i}))
 		error('get_fact : invalid factor');
 	end
 
 end
-%}
+
 
 
 
@@ -597,13 +597,13 @@ disp('Ok');
 
 %% get_fact test
 disp('TEST GET_FACT : ');
-%{for i=1:nb_fact
+for i=1:nb_fact
 	A=get_fact(F,i);
 	if(A~=factors{i})
 		error('get_fact : invalid factor');
 	end
 
-end%}
+end
 disp('Ok');
 
 

misc/test/src/test_matlab_faust2.m

@@ -76,7 +76,7 @@ disp('Ok');
 
 disp('test 2 : '); 
 test_pass = 0;
-expected_err_message='addSpmat : empty matlab matrix';
+expected_err_message='concatMatGeneric : empty matlab matrix';
 factors=cell(1,nb_fact); % each cell is empty, must contained a matrix
 
 

wrapper/matlab/src/mexFaust.cpp

@@ -208,7 +208,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
 			break;
 
 			default:
-		   		handleError("blabla","get_fact : unknown type of the factor matrix");
+		   		mexErrMsgTxt("get_fact : unknown type of the factor matrix");
 		} 
 		delete factor_generic;