From cc7933fa68cd54f86997b11a5bf2fea5c6524b14 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Fri, 19 Oct 2018 15:51:59 +0200 Subject: Always use wgt when talking about widget We already have a wgt directory so this just make use the same for the test widget directory. Change-Id: I2eb5c7a4faf17adb8f011b7e37ac98389340d41b Signed-off-by: Romain Forlot --- cmake/cmake.d/03-macros.cmake | 2 +- test-wgt/launcher.sh.in | 50 ++++++++++++++++++++++++++++++++++++++++++ test-wgt/test-config.xml.in | 25 +++++++++++++++++++++ test-widget/launcher.sh.in | 50 ------------------------------------------ test-widget/test-config.xml.in | 25 --------------------- 5 files changed, 76 insertions(+), 76 deletions(-) create mode 100644 test-wgt/launcher.sh.in create mode 100644 test-wgt/test-config.xml.in delete mode 100644 test-widget/launcher.sh.in delete mode 100644 test-widget/test-config.xml.in diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake index d4fdf7d..f3abedf 100644 --- a/cmake/cmake.d/03-macros.cmake +++ b/cmake/cmake.d/03-macros.cmake @@ -545,7 +545,7 @@ macro(wgt_package_build) COMMAND ${CMAKE_COMMAND} -DINFILE=${TEST_WIDGET_CONFIG_TEMPLATE} -DOUTFILE=${PROJECT_PKG_TEST_DIR}/config.xml -DPROJECT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/cmake/configure_file.cmake COMMAND mkdir -p ${PROJECT_PKG_TEST_DIR}/bin COMMAND cp ${ICON_PATH} ${PROJECT_PKG_TEST_DIR}/${PROJECT_ICON} - COMMAND cp ${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/test-widget/launcher.sh.in ${PROJECT_PKG_TEST_DIR}/bin/launcher + COMMAND cp ${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/test-wgt/launcher.sh.in ${PROJECT_PKG_TEST_DIR}/bin/launcher ) add_custom_command(OUTPUT ${WGT_NAME}.wgt diff --git a/test-wgt/launcher.sh.in b/test-wgt/launcher.sh.in new file mode 100644 index 0000000..7414a7b --- /dev/null +++ b/test-wgt/launcher.sh.in @@ -0,0 +1,50 @@ +#!/bin/bash + +########################################################################### +# Copyright (C) 2017, 2018 IoT.bzh +# +# Author: Romain Forlot +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + +PORT=$1 +TOKEN=$2 + +# Research the Api name used +CFGFILE=$(find ${AFM_APP_INSTALL_DIR} -name "*json" -print | head -n1) +API=$(grep '\"api\"' ${CFGFILE} | cut -d'"' -f4) + +AFBCLIENTIN=$(mktemp -u) +AFBCLIENTOUT=$(mktemp -u) +mkfifo $AFBCLIENTIN +mkfifo $AFBCLIENTOUT + +declare -a testVerb + +if [[ $(jq '.testVerb|type' $CFGFILE) == "array" ]] +then + testVerbLength=$(jq '.testVerb | length') + for (( idx=0; idx + + @PROJECT_NAME@-test + + + Test widget used to launch tests for the project @PROJECT_NAME@ + Romain Forlot <romain.forlot@iot.bzh> + APL2.0 + + + + + + + + + + + + + + + + + diff --git a/test-widget/launcher.sh.in b/test-widget/launcher.sh.in deleted file mode 100644 index 7414a7b..0000000 --- a/test-widget/launcher.sh.in +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -########################################################################### -# Copyright (C) 2017, 2018 IoT.bzh -# -# Author: Romain Forlot -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -########################################################################### - -PORT=$1 -TOKEN=$2 - -# Research the Api name used -CFGFILE=$(find ${AFM_APP_INSTALL_DIR} -name "*json" -print | head -n1) -API=$(grep '\"api\"' ${CFGFILE} | cut -d'"' -f4) - -AFBCLIENTIN=$(mktemp -u) -AFBCLIENTOUT=$(mktemp -u) -mkfifo $AFBCLIENTIN -mkfifo $AFBCLIENTOUT - -declare -a testVerb - -if [[ $(jq '.testVerb|type' $CFGFILE) == "array" ]] -then - testVerbLength=$(jq '.testVerb | length') - for (( idx=0; idx - - @PROJECT_NAME@-test - - - Test widget used to launch tests for the project @PROJECT_NAME@ - Romain Forlot <romain.forlot@iot.bzh> - APL2.0 - - - - - - - - - - - - - - - - - -- cgit 1.2.3-korg