diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4679cb77543d8fb8c383cbb39199f110e7d1e625..184ddf691ac6e70beb25ac640a17f548f982496b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -211,6 +211,8 @@ XFAIL_MODFILES = ramst_xfail.mod \
estim_param_in_shock_value.mod \
optimal_policy/Ramsey/ramsey_ex_wrong_ss_file.mod
+MFILES = initval_file/ramst_initval_file_data.m
+
# Dependencies
example1_use_dll.m.trs: example1.m.trs
example1_use_dll.o.trs: example1.o.trs
@@ -285,6 +287,11 @@ deterministic_simulations/rbc_det_exo_lag_2c.m.trs: deterministic_simulations/rb
deterministic_simulations/rbc_det_exo_lag_2b.o.trs: deterministic_simulations/rbc_det_exo_lag_2a.o.trs
deterministic_simulations/rbc_det_exo_lag_2c.o.trs: deterministic_simulations/rbc_det_exo_lag_2a.o.trs
+initval_file/ramst_initval_file.m.trs: initval_file/ramst_initval_file_data.m.tls
+initval_file/ramst_initval_file.o.trs: initval_file/ramst_initval_file_data.o.tls
+
+
+
# Matlab TRS Files
M_TRS_FILES = $(patsubst %.mod, %.m.trs, $(MODFILES))
M_TRS_FILES += run_block_byte_tests_matlab.m.trs run_reporting_test_matlab.m.trs run_all_unitary_tests.m.trs
@@ -295,12 +302,21 @@ O_TRS_FILES = $(patsubst %.mod, %.o.trs, $(MODFILES))
O_TRS_FILES += run_block_byte_tests_octave.o.trs run_reporting_test_octave.o.trs run_all_unitary_tests.o.trs
O_XFAIL_TRS_FILES = $(patsubst %.mod, %.o.trs, $(XFAIL_MODFILES))
+# Matlab TLS Files
+M_TLS_FILES = $(patsubst %.m, %.m.tls, $(MFILES))
+
+# Octave TLS Files
+O_TLS_FILES = $(patsubst %.m, %.o.tls, $(MFILES))
+
+
+
EXTRA_DIST = \
read_trs_files.sh \
run_test_matlab.m \
run_test_octave.m \
$(MODFILES) \
$(XFAIL_MODFILES) \
+ $(MFILES) \
run_block_byte_tests_matlab.m \
run_block_byte_tests_octave.m \
run_reporting_test_matlab.m \
@@ -321,10 +337,6 @@ EXTRA_DIST = \
fs2000_ssfile_aux.m \
printMakeCheckMatlabErrMsg.m \
printMakeCheckOctaveErrMsg.m \
- initval_file/ramst_initval_file_data.m \
- initval_file/ramst_initval_file_data_col_vec_mat.mat \
- initval_file/ramst_initval_file_data_row_vec_mat.mat \
- initval_file/ramst_initval_file_excel.xls \
test.m \
AIM/data_ca1.m \
AIM/fs2000_b1L1L_AIM_steadystate.m \
@@ -422,10 +434,22 @@ check-octave: $(O_XFAIL_TRS_FILES) $(O_TRS_FILES)
DYNARE_VERSION="$(PACKAGE_VERSION)" TOP_TEST_DIR="$(PWD)" \
$(OCTAVE) --no-init-file --silent --no-history $< > $*.o.log 2>&1
+%.m.tls : %.m
+ TOP_TEST_DIR="$(PWD)" FILESTEM="$*" \
+ $(MATLAB)/bin/matlab -nosplash -nodisplay -r run_m_script
+ touch $*.m.tls
+
+%.o.tls : %.m
+ TOP_TEST_DIR="$(PWD)" FILESTEM="$*" \
+ $(OCTAVE) --no-init-file --silent --no-history run_m_script 2>&1
+
+
clean-local:
rm -f $(M_TRS_FILES) \
+ $(M_TLS_FILES) \
$(M_XFAIL_TRS_FILES) \
$(O_TRS_FILES) \
+ $(O_TLS_FILES) \
$(O_XFAIL_TRS_FILES) \
$(patsubst %.trs, %.log, $(M_TRS_FILES)) \
$(patsubst %.trs, %.log, $(M_XFAIL_TRS_FILES)) \
@@ -492,3 +516,5 @@ clean-local:
ms-sbvar/tmv_rr_tr
rm -f estimation/test_matrix.mat
+
+ rm -f initval_file/ramst_initval_file_data_col_vec_mat.mat initval_file/ramst_initval_file_data_row_vec_mat.mat initval_file/ramst_initval_file_excel.xls
diff --git a/tests/initval_file/ramst_initval_file.mod b/tests/initval_file/ramst_initval_file.mod
index c45327faf56d940a3191293d883b2e82ec50e12b..8a8e36edcd19001ee282cd46680b22baa6a948b6 100644
--- a/tests/initval_file/ramst_initval_file.mod
+++ b/tests/initval_file/ramst_initval_file.mod
@@ -22,26 +22,34 @@ k = ((delt+bet)/(1.0*aa*alph))^(1/(alph-1));
c = aa*k^alph-delt*k;
end;
+disp('Test #1')
initval_file(filename = ramst_initval_file_data);
steady;
simul(periods=200);
+
+disp('Test #2')
initval_file(filename = ramst_initval_file_data_row_vec_mat);
steady;
simul(periods=200);
+
+disp('Test #3')
+
initval_file(filename = ramst_initval_file_data_col_vec_mat);
steady;
simul(periods=200);
-initval_file(filename = ramst_initval_file_excel);
+if ispc()
+ disp('Test #4')
-steady;
-
-simul(periods=200);
+ initval_file(filename = ramst_initval_file_excel);
+ steady;
+ simul(periods=200);
+end
diff --git a/tests/initval_file/ramst_initval_file_data.m b/tests/initval_file/ramst_initval_file_data.m
index f7d82234c1bcb6538db89aaa828032d5be9c297c..d5b750a3100ee533a228f4845e51dfac001d656c 100644
--- a/tests/initval_file/ramst_initval_file_data.m
+++ b/tests/initval_file/ramst_initval_file_data.m
@@ -1,10 +1,14 @@
x = vertcat([ 1; 1.2 ], repmat(1, 200, 1));
k = repmat(12.7551, 202, 1);
c = repmat(1.53061, 202, 1);
-% save ramst_initval_file_data_col_vec_mat
-% xlswrite('ramst_initval_file_excel',[x k c],1,'A2')
-% xlswrite('ramst_initval_file_excel',{'x' 'k' 'c'},1,'A1')
-% c=c'
-% k=k'
-% x=x'
-% save ramst_initval_file_data_row_vec_mat
\ No newline at end of file
+save('ramst_initval_file_data_col_vec_mat');
+
+if ispc()
+ xlswrite('ramst_initval_file_excel',[x k c],1,'A2');
+ xlswrite('ramst_initval_file_excel',{'x' 'k' 'c'},1,'A1');
+end
+
+c=c';
+k=k';
+x=x';
+save('ramst_initval_file_data_row_vec_mat');
\ No newline at end of file
diff --git a/tests/initval_file/ramst_initval_file_data_col_vec_mat.mat b/tests/initval_file/ramst_initval_file_data_col_vec_mat.mat
deleted file mode 100644
index 48c59f12f63781c4af061077c866309150505170..0000000000000000000000000000000000000000
Binary files a/tests/initval_file/ramst_initval_file_data_col_vec_mat.mat and /dev/null differ
diff --git a/tests/initval_file/ramst_initval_file_data_row_vec_mat.mat b/tests/initval_file/ramst_initval_file_data_row_vec_mat.mat
deleted file mode 100644
index 1d975256775a3b202f95b7d80e37a253a86aaaf0..0000000000000000000000000000000000000000
Binary files a/tests/initval_file/ramst_initval_file_data_row_vec_mat.mat and /dev/null differ
diff --git a/tests/initval_file/ramst_initval_file_excel.xls b/tests/initval_file/ramst_initval_file_excel.xls
deleted file mode 100644
index 1bea58b16c2cd91ac57cb687cbe520a33bcf06f3..0000000000000000000000000000000000000000
Binary files a/tests/initval_file/ramst_initval_file_excel.xls and /dev/null differ