From 8b1e76a1bfcca7908ad78efebde6dfb1480da4cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Scylla=29?=
 <stephane.adjemian@univ-lemans.fr>
Date: Fri, 13 Dec 2013 16:21:10 +0100
Subject: [PATCH] Renamed tests/run_unitary_tests.m script to avoid conflict
 with matlab/utilities/tests/run_unitary_tests.m function.

---
 tests/Makefile.am                                      | 6 +++---
 tests/{run_unitary_tests.m => run_all_unitary_tests.m} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename tests/{run_unitary_tests.m => run_all_unitary_tests.m} (100%)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1386f8d516..f85e8e5cbd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -239,12 +239,12 @@ dsge-var/dsgevar_forward_estimated_lambda.o.trs: dsge-var/simul_hybrid.o.trs
 
 # 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_unitary_tests.m.trs
+M_TRS_FILES += run_block_byte_tests_matlab.m.trs run_reporting_test_matlab.m.trs run_all_unitary_tests.m.trs
 M_XFAIL_TRS_FILES = $(patsubst %.mod, %.m.trs, $(XFAIL_MODFILES))
 
 # Octave TRS Files
 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_unitary_tests.o.trs
+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))
 
 EXTRA_DIST = \
@@ -257,7 +257,7 @@ EXTRA_DIST = \
 	run_block_byte_tests_octave.m \
 	run_reporting_test_matlab.m \
 	run_reporting_test_octave.m \
-	run_unitary_tests.m \
+	run_all_unitary_tests.m \
 	reporting/AnnualTable.m \
 	reporting/CommResidTablePage.m \
 	reporting/CountryGraphPage.m \
diff --git a/tests/run_unitary_tests.m b/tests/run_all_unitary_tests.m
similarity index 100%
rename from tests/run_unitary_tests.m
rename to tests/run_all_unitary_tests.m
-- 
GitLab