From cb746f199d0808398633076aa67b482eafe650dc Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 20 Oct 2016 14:11:47 +0200 Subject: [PATCH] feat(tool/update_resources): ignore `*.spec.qml` files --- tests/resources.qrc | 4 +--- tests/tools/test_qml | 2 +- tests/tools/update_resources | 5 +++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/resources.qrc b/tests/resources.qrc index 06cfad5d9..f445e1782 100644 --- a/tests/resources.qrc +++ b/tests/resources.qrc @@ -1,5 +1,5 @@ - + imgs/add_field.svg imgs/call.svg imgs/cam.svg @@ -32,7 +32,6 @@ ui/modules/Common/Colors.qml ui/modules/Common/Constants.qml ui/modules/Common/Dialog/ConfirmDialog.qml - ui/modules/Common/Dialog/ConfirmDialog.spec.qml ui/modules/Common/Dialog/DialogDescription.qml ui/modules/Common/Dialog/DialogPlus.qml ui/modules/Common/DroppableTextArea.qml @@ -95,7 +94,6 @@ ui/modules/Linphone/Timeline.qml ui/scripts/Utils/qmldir ui/scripts/Utils/utils.js - ui/scripts/Utils/utils.spec.qml ui/views/Calls/Calls.qml ui/views/Calls/StartingCall.qml ui/views/Calls/StartingIncomingCall.qml diff --git a/tests/tools/test_qml b/tests/tools/test_qml index af0afa615..dd031d9d4 100644 --- a/tests/tools/test_qml +++ b/tests/tools/test_qml @@ -50,7 +50,7 @@ do fi done < $RESOURCES_FILE -printf "\n" +printf "${NC}\n" if [[ $so_far_so_good == 0 ]]; then printf "${GREEN}Done. All tests have succeeded.\n" else diff --git a/tests/tools/update_resources b/tests/tools/update_resources index d8d6a1a45..ac09e3c9f 100755 --- a/tests/tools/update_resources +++ b/tests/tools/update_resources @@ -23,8 +23,9 @@ do basename="${filename##*/}" extension="${filename##*.}" - if [[ ${extension} == @(qml|svg|png|jpg|js) || - ${basename} == qmldir ]]; then + if [[ $extension == @(svg|png|jpg|js) || + $basename == qmldir || + ($extension == qml && $basename != *\.spec\.qml) ]]; then echo " $filename" >> $RESOURCES_FILE fi done