From 09e5440b69906b3b325203521c851c06f3ce4fa3 Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan@dynare.org>
Date: Wed, 9 Sep 2015 10:44:52 +0200
Subject: [PATCH] test suite: fix bugs introduced in
 ad66a7bb3521066005276ede497e0e10f8cc211b and
 fe221bbc429ee73507c6e53adaeb2b78258d7f4d that broke parallel processing of
 test suite

---
 tests/Makefile.am                                      | 10 +++++-----
 tests/conditional_forecasts/{ => 1}/fs2000_cal.mod     |  0
 tests/conditional_forecasts/{ => 2}/fs2000_est.mod     |  0
 tests/conditional_forecasts/{ => 2}/fsdat_simul.m      |  0
 .../{ => 3}/fs2000_conditional_forecast_initval.mod    |  0
 .../{ => 4}/fs2000_conditional_forecast_histval.mod    |  0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename tests/conditional_forecasts/{ => 1}/fs2000_cal.mod (100%)
 rename tests/conditional_forecasts/{ => 2}/fs2000_est.mod (100%)
 rename tests/conditional_forecasts/{ => 2}/fsdat_simul.m (100%)
 rename tests/conditional_forecasts/{ => 3}/fs2000_conditional_forecast_initval.mod (100%)
 rename tests/conditional_forecasts/{ => 4}/fs2000_conditional_forecast_histval.mod (100%)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 621b64082a..c99fd93410 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -136,10 +136,10 @@ MODFILES = \
 	simul/Solow_no_varexo.mod \
 	simul/simul_ZLB_purely_forward.mod \
 	simul/simul_ZLB_purely_forward_no_solution.mod \
-	conditional_forecasts/fs2000_cal.mod \
-	conditional_forecasts/fs2000_est.mod \
-	conditional_forecasts/fs2000_conditional_forecast_initval.mod \
-	conditional_forecasts/fs2000_conditional_forecast_histval.mod \
+	conditional_forecasts/1/fs2000_cal.mod \
+	conditional_forecasts/2/fs2000_est.mod \
+	conditional_forecasts/3/fs2000_conditional_forecast_initval.mod \
+	conditional_forecasts/4/fs2000_conditional_forecast_histval.mod \
 	recursive/ls2003.mod \
 	recursive/ls2003_bayesian.mod \
 	recursive/ls2003_bayesian_xls.mod \
@@ -413,7 +413,7 @@ EXTRA_DIST = \
 	measurement_errors/fs2000_corr_me_ml_mcmc/fsdat_simul.m \
 	missing/simulate_data_with_missing_observations.m \
 	objectives/sgu_ex1.mat \
-	conditional_forecasts/fsdat_simul.m \
+	conditional_forecasts/2/fsdat_simul.m \
 	ms-sbvar/data.m \
 	ms-sbvar/archive-files/ftd_2s_caseall_upperchol3v.m \
 	ms-sbvar/archive-files/ftd_2s_caseall_upperchol4v.m \
diff --git a/tests/conditional_forecasts/fs2000_cal.mod b/tests/conditional_forecasts/1/fs2000_cal.mod
similarity index 100%
rename from tests/conditional_forecasts/fs2000_cal.mod
rename to tests/conditional_forecasts/1/fs2000_cal.mod
diff --git a/tests/conditional_forecasts/fs2000_est.mod b/tests/conditional_forecasts/2/fs2000_est.mod
similarity index 100%
rename from tests/conditional_forecasts/fs2000_est.mod
rename to tests/conditional_forecasts/2/fs2000_est.mod
diff --git a/tests/conditional_forecasts/fsdat_simul.m b/tests/conditional_forecasts/2/fsdat_simul.m
similarity index 100%
rename from tests/conditional_forecasts/fsdat_simul.m
rename to tests/conditional_forecasts/2/fsdat_simul.m
diff --git a/tests/conditional_forecasts/fs2000_conditional_forecast_initval.mod b/tests/conditional_forecasts/3/fs2000_conditional_forecast_initval.mod
similarity index 100%
rename from tests/conditional_forecasts/fs2000_conditional_forecast_initval.mod
rename to tests/conditional_forecasts/3/fs2000_conditional_forecast_initval.mod
diff --git a/tests/conditional_forecasts/fs2000_conditional_forecast_histval.mod b/tests/conditional_forecasts/4/fs2000_conditional_forecast_histval.mod
similarity index 100%
rename from tests/conditional_forecasts/fs2000_conditional_forecast_histval.mod
rename to tests/conditional_forecasts/4/fs2000_conditional_forecast_histval.mod
-- 
GitLab