From 5e3a7dba70d7ea8860bb61943983fdabb42640da Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 6 Oct 2016 17:38:04 +0200 Subject: [PATCH] Purposely ignore all build* directories --- Scripts/developer_scripts/test_merge_of_branch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Scripts/developer_scripts/test_merge_of_branch b/Scripts/developer_scripts/test_merge_of_branch index f957d1d7a3e..9c25d33d4bc 100755 --- a/Scripts/developer_scripts/test_merge_of_branch +++ b/Scripts/developer_scripts/test_merge_of_branch @@ -83,7 +83,7 @@ else fi #check cmake scripts of tests, examples are present -for i in `ls -d */examples/*/ */test/*/`; do +for i in `ls -d ^build*/examples/*/ ^build*/test/*/`; do if ! [ -f $i/CMakeLists.txt ]; then echo "Error: $i/CMakeLists.txt does not exist!" exit 1 @@ -92,9 +92,9 @@ done # check project in cmake scripts is correct -project_name_tests=$(for i in */test/*/CMakeLists.txt; do pkg=$(echo $i | awk -F "/" '{print $3}'); egrep "${pkg}_Tests\s*\)" -L $i; done) -project_name_examples=$(for i in */examples/*/CMakeLists.txt; do pkg=$(echo $i | awk -F "/" '{print $3}'); egrep "${pkg}_Examples\s*\)" -L $i; done) -project_name_demo=$(for i in */demo/*/CMakeLists.txt; do pkg=$(echo $i | awk -F "/" '{print $3}'); egrep "${pkg}_Demo\s*\)" -L $i; done) +project_name_tests=$(for i in ^build*test/*/CMakeLists.txt; do pkg=$(echo $i | awk -F "/" '{print $3}'); egrep "${pkg}_Tests\s*\)" -L $i; done) +project_name_examples=$(for i in ^build*examples/*/CMakeLists.txt; do pkg=$(echo $i | awk -F "/" '{print $3}'); egrep "${pkg}_Examples\s*\)" -L $i; done) +project_name_demo=$(for i in ^build*demo/*/CMakeLists.txt; do pkg=$(echo $i | awk -F "/" '{print $3}'); egrep "${pkg}_Demo\s*\)" -L $i; done) if [ -n "${project_name_tests}" ]; then echo "CMakeLists with incorrect project name"