diff options
| -rw-r--r-- | .gitlab/issue_templates/mytemplate.md | 3 | ||||
| -rw-r--r-- | .gitlab/merge_request_templates/mytemplate.md | 3 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | autobuild/agl/autobuild | 179 | ||||
| -rwxr-xr-x | autobuild/linux/autobuild | 179 | ||||
| -rw-r--r-- | binding/media-manager.c | 15 | ||||
| -rw-r--r-- | conf.d/wgt/config.xml.in | 1 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 28 | ||||
| -rw-r--r-- | test/afb-test/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | test/afb-test/etc/CMakeLists.txt | 32 | ||||
| -rw-r--r-- | test/afb-test/etc/aft-agl-mediascanner.json | 22 | ||||
| -rw-r--r-- | test/afb-test/tests/CMakeLists.txt | 31 | ||||
| -rw-r--r-- | test/afb-test/tests/mediascanner.lua | 26 |
13 files changed, 328 insertions, 214 deletions
diff --git a/.gitlab/issue_templates/mytemplate.md b/.gitlab/issue_templates/mytemplate.md new file mode 100644 index 0000000..25d91d8 --- /dev/null +++ b/.gitlab/issue_templates/mytemplate.md @@ -0,0 +1,3 @@ +**Please use https://gerrit.automotivelinux.org for code contributions.** +See also: https://docs.automotivelinux.org/ chapter "How to contribute". + diff --git a/.gitlab/merge_request_templates/mytemplate.md b/.gitlab/merge_request_templates/mytemplate.md new file mode 100644 index 0000000..25d91d8 --- /dev/null +++ b/.gitlab/merge_request_templates/mytemplate.md @@ -0,0 +1,3 @@ +**Please use https://gerrit.automotivelinux.org for code contributions.** +See also: https://docs.automotivelinux.org/ chapter "How to contribute". + @@ -28,6 +28,8 @@ with the following fields. | genre | genre type for media entry | | type | media entry data type *(e.g audio, video)* | +If no media is present, the an empty array will be returned. + ## Events | Name | Description | diff --git a/autobuild/agl/autobuild b/autobuild/agl/autobuild index 7816b3d..16181b8 100755 --- a/autobuild/agl/autobuild +++ b/autobuild/agl/autobuild @@ -1,5 +1,6 @@ #!/usr/bin/make -f # Copyright (C) 2015 - 2018 "IoT.bzh" +# Copyright (C) 2020 Konsulko Group # Author "Romain Forlot" <romain.forlot@iot.bzh> # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,139 +16,113 @@ # limitations under the License. THISFILE := $(lastword $(MAKEFILE_LIST)) -BUILD_DIR := $(abspath $(dir $(THISFILE))/../../build) -BUILD_DIR_TEST := $(abspath $(dir $(THISFILE))/../../build-test) -BUILD_DIR_DEBUG := $(abspath $(dir $(THISFILE))/../../build-debug) -BUILD_DIR_COVERAGE := $(abspath $(dir $(THISFILE))/../../build-coverage) -BUILD_DIR_DEBUG_TEST := $(abspath $(dir $(THISFILE))/../../build-debug-test) -BUILD_DIR_COVERAGE_TEST := $(abspath $(dir $(THISFILE))/../../build-coverage-test) -DEST := ${BUILD_DIR} - -.PHONY: all clean distclean configure build package help update configure-debug configure-coverage build-debug build-coverage package-test package-debug package-coverage package-debug package-debug-test package-coverage-test package-all -all: help +ROOT_DIR := $(abspath $(dir $(THISFILE))/../..) + +# Build directories +# Note that the debug/test/coverage directories are defined in relation +# to the release directory (BUILD_DIR), this needs to be kept in mind +# if over-riding it and building those widget types, the specific widget +# type variable (e.g. BUILD_DIR_DEBUG) may also need to be specified +# to yield the desired output hierarchy. +BUILD_DIR = $(ROOT_DIR)/build +BUILD_DIR_DEBUG = $(abspath $(BUILD_DIR)/../build-debug) +BUILD_DIR_TEST = $(abspath $(BUILD_DIR)/../build-test) +BUILD_DIR_COVERAGE = $(abspath $(BUILD_DIR)/../build-coverage) + +# Output directory variable for use in pattern rules. +# This is intended for internal use only, hence the explicit override +# definition. +override OUTPUT_DIR = $(BUILD_DIR) + +# Final install directory for widgets +DEST = $(OUTPUT_DIR) + +# Default build type for release/test builds +BUILD_TYPE = RELEASE + +.PHONY: all help update install distclean +.PHONY: clean clean-release clean-debug clean-test clean-coverage clean-all +.PHONY: configure configure-release configure-debug configure-test configure-coverage +.PHONY: build build-release build-debug build-test build-coverage build-all +.PHONY: package package-release package-debug package-test package-coverage package-all help: @echo "List of targets available:" @echo "" @echo "- all" + @echo "- help" @echo "- clean" @echo "- distclean" @echo "- configure" @echo "- build: compilation, link and prepare files for package into a widget" @echo "- package: output a widget file '*.wgt'" - @echo "- install: install in your ${CMAKE_INSTALL_DIR} directory" + @echo "- install: install in your $(CMAKE_INSTALL_DIR) directory" @echo "" @echo "Usage: ./autobuild/agl/autobuild package DEST=${HOME}/opt" @echo "Don't use your build dir as DEST as wgt file is generated at this location" -update: configure - @cmake --build ${BUILD_DIR} --target autobuild +all: package-all -clean: - @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} ${CLEAN_ARGS} clean) || echo Nothing to clean +# Target specific variable over-rides so static pattern rules can be +# used for the various type-specific targets. -distclean: - @rm -rf ${BUILD_DIR} +configure-test build-test package-test clean-test: OUTPUT_DIR = $(BUILD_DIR_TEST) -configure: - @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR} - @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake -DCMAKE_BUILD_TYPE=RELEASE ${CONFIGURE_ARGS} ..) +configure-coverage build-coverage package-coverage clean-coverage: OUTPUT_DIR = $(BUILD_DIR_COVERAGE) +configure-coverage build-coverage package-coverage: BUILD_TYPE = COVERAGE -configure-test: - @[ -d ${BUILD_DIR_TEST} ] || mkdir -p ${BUILD_DIR_TEST} - @[ -f ${BUILD_DIR_TEST}/Makefile ] || (cd ${BUILD_DIR_TEST} && cmake -DCMAKE_BUILD_TYPE=RELEASE ${CONFIGURE_ARGS} ..) +configure-debug build-debug package-debug clean-debug: OUTPUT_DIR = $(BUILD_DIR_DEBUG) +configure-debug build-debug package-debug: BUILD_TYPE = DEBUG -configure-debug: - @[ -d ${BUILD_DIR_DEBUG} ] || mkdir -p ${BUILD_DIR_DEBUG} - @[ -f ${BUILD_DIR_DEBUG}/Makefile ] || (cd ${BUILD_DIR_DEBUG} && cmake -DCMAKE_BUILD_TYPE=DEBUG ${CONFIGURE_ARGS} ..) +clean-release clean-test clean-debug clean-coverage: + @if [ -d $(OUTPUT_DIR) ]; then \ + $(MAKE) -C $(OUTPUT_DIR) $(CLEAN_ARGS) clean; \ + else \ + echo Nothing to clean; \ + fi -configure-coverage: - @[ -d ${BUILD_DIR_COVERAGE} ] || mkdir -p ${BUILD_DIR_COVERAGE} - @[ -f ${BUILD_DIR_COVERAGE}/Makefile ] || (cd ${BUILD_DIR_COVERAGE} && cmake -DCMAKE_BUILD_TYPE=COVERAGE ${CONFIGURE_ARGS} ..) +clean: clean-release -build: configure - @cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all +clean-all: clean-release clean-test clean-debug clean-coverage -build-test: configure-test - @cmake --build ${BUILD_DIR_TEST} ${BUILD_ARGS} --target all - -build-debug: configure-debug - @cmake --build ${BUILD_DIR_DEBUG} ${BUILD_ARGS} --target all - -build-coverage: configure-coverage - @cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all - -package: build - @mkdir -p ${BUILD_DIR}/$@/bin - @mkdir -p ${BUILD_DIR}/$@/etc - @mkdir -p ${BUILD_DIR}/$@/lib - @mkdir -p ${BUILD_DIR}/$@/htdocs - @mkdir -p ${BUILD_DIR}/$@/var - @cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget - @if [ "${DEST}" != "${BUILD_DIR}" ]; then \ - mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \ - fi +distclean: clean-all -package-test: build-test - @mkdir -p ${BUILD_DIR_TEST}/$@/bin - @mkdir -p ${BUILD_DIR_TEST}/$@/etc - @mkdir -p ${BUILD_DIR_TEST}/$@/lib - @mkdir -p ${BUILD_DIR_TEST}/$@/htdocs - @mkdir -p ${BUILD_DIR_TEST}/$@/var - @cmake --build ${BUILD_DIR_TEST} ${PACKAGE_ARGS} --target widget - @cmake --build ${BUILD_DIR_TEST} ${PACKAGE_ARGS} --target test_widget - @if [ "${DEST}" != "${BUILD_DIR_TEST}" ]; then \ - mkdir -p ${DEST} && cp ${BUILD_DIR_TEST}/*.wgt ${DEST}; \ +configure-release configure-test configure-debug configure-coverage: + @mkdir -p $(OUTPUT_DIR) + @if [ ! -f $(OUTPUT_DIR)/Makefile ]; then \ + (cd $(OUTPUT_DIR) && cmake -S $(ROOT_DIR) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) $(CONFIGURE_ARGS)); \ fi -package-debug: build-debug - @mkdir -p ${BUILD_DIR_DEBUG}/$@/bin - @mkdir -p ${BUILD_DIR_DEBUG}/$@/etc - @mkdir -p ${BUILD_DIR_DEBUG}/$@/lib - @mkdir -p ${BUILD_DIR_DEBUG}/$@/htdocs - @mkdir -p ${BUILD_DIR_DEBUG}/$@/var - @cmake --build ${BUILD_DIR_DEBUG} ${PACKAGE_ARGS} --target widget - @if [ "${DEST}" != "${BUILD_DIR_DEBUG}" ]; then \ - mkdir -p ${DEST} && cp ${BUILD_DIR_DEBUG}/*.wgt ${DEST}; \ - fi +configure: configure-release + +build-release build-debug build-coverage: build-%: configure-% + @cmake --build $(OUTPUT_DIR) $(BUILD_ARGS) --target all -package-coverage: build-coverage - @mkdir -p ${BUILD_DIR_COVERAGE}/$@/bin - @mkdir -p ${BUILD_DIR_COVERAGE}/$@/etc - @mkdir -p ${BUILD_DIR_COVERAGE}/$@/lib - @mkdir -p ${BUILD_DIR_COVERAGE}/$@/htdocs - @mkdir -p ${BUILD_DIR_COVERAGE}/$@/var - @cmake --build ${BUILD_DIR_COVERAGE} ${PACKAGE_ARGS} --target widget - @if [ "${DEST}" != "${BUILD_DIR_COVERAGE}" ]; then \ - mkdir -p ${DEST} && cp ${BUILD_DIR_COVERAGE}/*.wgt ${DEST}; \ +# Kept for consistency, empty to avoid building everything for test widget +build-test: configure-test + +build: build-release + +build-all: build-release build-debug build-test build-coverage + +package-release package-debug package-coverage: package-%: build-% + @cmake --build $(OUTPUT_DIR) $(PACKAGE_ARGS) --target widget + @if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \ + mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \ fi -package-coverage-test: build-coverage - @mkdir -p ${BUILD_DIR_COVERAGE_TEST}/$@/bin - @mkdir -p ${BUILD_DIR_COVERAGE_TEST}/$@/etc - @mkdir -p ${BUILD_DIR_COVERAGE_TEST}/$@/lib - @mkdir -p ${BUILD_DIR_COVERAGE_TEST}/$@/htdocs - @mkdir -p ${BUILD_DIR_COVERAGE_TEST}/$@/var - @cmake --build ${BUILD_DIR_COVERAGE_TEST} ${PACKAGE_ARGS} --target widget - @cmake --build ${BUILD_DIR_COVERAGE_TEST} ${PACKAGE_ARGS} --target test_widget - @if [ "${DEST}" != "${BUILD_DIR_COVERAGE_TEST}" ]; then \ - mkdir -p ${DEST} && cp ${BUILD_DIR_COVERAGE_TEST}/*.wgt ${DEST}; \ +package-test: build-test + @cmake --build $(OUTPUT_DIR) $(PACKAGE_ARGS) --target test_widget + @if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \ + mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \ fi +package: package-release -package-debug-test: build-debug - @mkdir -p ${BUILD_DIR_DEBUG_TEST}/$@/bin - @mkdir -p ${BUILD_DIR_DEBUG_TEST}/$@/etc - @mkdir -p ${BUILD_DIR_DEBUG_TEST}/$@/lib - @mkdir -p ${BUILD_DIR_DEBUG_TEST}/$@/htdocs - @mkdir -p ${BUILD_DIR_DEBUG_TEST}/$@/var - @cmake --build ${BUILD_DIR_DEBUG_TEST} ${PACKAGE_ARGS} --target widget - @cmake --build ${BUILD_DIR_DEBUG_TEST} ${PACKAGE_ARGS} --target test_widget - @if [ "${DEST}" != "${BUILD_DIR_DEBUG_TEST}" ]; then \ - mkdir -p ${DEST} && cp ${BUILD_DIR_DEBUG_TEST}/*.wgt ${DEST}; \ - fi +package-all: package-release package-test package-coverage package-debug -package-all: package package-test package-coverage package-debug +update: configure + @cmake --build $(BUILD_DIR) --target autobuild install: build - @cmake --build ${BUILD_DIR} ${INSTALL_ARGS} --target install + @cmake --build $(BUILD_DIR) $(INSTALL_ARGS) --target install diff --git a/autobuild/linux/autobuild b/autobuild/linux/autobuild index 7816b3d..16181b8 100755 --- a/autobuild/linux/autobuild +++ b/autobuild/linux/autobuild @@ -1,5 +1,6 @@ #!/usr/bin/make -f # Copyright (C) 2015 - 2018 "IoT.bzh" +# Copyright (C) 2020 Konsulko Group # Author "Romain Forlot" <romain.forlot@iot.bzh> # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,139 +16,113 @@ # limitations under the License. THISFILE := $(lastword $(MAKEFILE_LIST)) -BUILD_DIR := $(abspath $(dir $(THISFILE))/../../build) -BUILD_DIR_TEST := $(abspath $(dir $(THISFILE))/../../build-test) -BUILD_DIR_DEBUG := $(abspath $(dir $(THISFILE))/../../build-debug) -BUILD_DIR_COVERAGE := $(abspath $(dir $(THISFILE))/../../build-coverage) -BUILD_DIR_DEBUG_TEST := $(abspath $(dir $(THISFILE))/../../build-debug-test) -BUILD_DIR_COVERAGE_TEST := $(abspath $(dir $(THISFILE))/../../build-coverage-test) -DEST := ${BUILD_DIR} - -.PHONY: all clean distclean configure build package help update configure-debug configure-coverage build-debug build-coverage package-test package-debug package-coverage package-debug package-debug-test package-coverage-test package-all -all: help +ROOT_DIR := $(abspath $(dir $(THISFILE))/../..) + +# Build directories +# Note that the debug/test/coverage directories are defined in relation +# to the release directory (BUILD_DIR), this needs to be kept in mind +# if over-riding it and building those widget types, the specific widget +# type variable (e.g. BUILD_DIR_DEBUG) may also need to be specified +# to yield the desired output hierarchy. +BUILD_DIR = $(ROOT_DIR)/build +BUILD_DIR_DEBUG = $(abspath $(BUILD_DIR)/../build-debug) +BUILD_DIR_TEST = $(abspath $(BUILD_DIR)/../build-test) +BUILD_DIR_COVERAGE = $(abspath $(BUILD_DIR)/../build-coverage) + +# Output directory variable for use in pattern rules. +# This is intended for internal use only, hence the explicit override +# definition. +override OUTPUT_DIR = $(BUILD_DIR) + +# Final install directory for widgets +DEST = $(OUTPUT_DIR) + +# Default build type for release/test builds +BUILD_TYPE = RELEASE + +.PHONY: all help update install distclean +.PHONY: clean clean-release clean-debug clean-test clean-coverage clean-all +.PHONY: configure configure-release configure-debug configure-test configure-coverage +.PHONY: build build-release build-debug build-test build-coverage build-all +.PHONY: package package-release package-debug package-test package-coverage package-all help: @echo "List of targets available:" @echo "" @echo "- all" + @echo "- help" @echo "- clean" @echo "- distclean" @echo "- configure" @echo "- build: compilation, link and prepare files for package into a widget" @echo "- package: output a widget file '*.wgt'" - @echo "- install: install in your ${CMAKE_INSTALL_DIR} directory" + @echo "- install: install in your $(CMAKE_INSTALL_DIR) directory" @echo "" @echo "Usage: ./autobuild/agl/autobuild package DEST=${HOME}/opt" @echo "Don't use your build dir as DEST as wgt file is generated at this location" -update: configure - @cmake --build ${BUILD_DIR} --target autobuild +all: package-all -clean: - @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} ${CLEAN_ARGS} clean) || echo Nothing to clean +# Target specific variable over-rides so static pattern rules can be +# used for the various type-specific targets. -distclean: - @rm -rf ${BUILD_DIR} +configure-test build-test package-test clean-test: OUTPUT_DIR = $(BUILD_DIR_TEST) -configure: - @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR} - @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake -DCMAKE_BUILD_TYPE=RELEASE ${CONFIGURE_ARGS} ..) +configure-coverage build-coverage package-coverage clean-coverage: OUTPUT_DIR = $(BUILD_DIR_COVERAGE) +configure-coverage build-coverage package-coverage: BUILD_TYPE = COVERAGE -configure-test: - @[ -d ${BUILD_DIR_TEST} ] || mkdir -p ${BUILD_DIR_TEST} - @[ -f ${BUILD_DIR_TEST}/Makefile ] || (cd ${BUILD_DIR_TEST} && cmake -DCMAKE_BUILD_TYPE=RELEASE ${CONFIGURE_ARGS} ..) +configure-debug build-debug package-debug clean-debug: OUTPUT_DIR = $(BUILD_DIR_DEBUG) +configure-debug build-debug package-debug: BUILD_TYPE = DEBUG -configure-debug: - @[ -d ${BUILD_DIR_DEBUG} ] || mkdir -p ${BUILD_DIR_DEBUG} - @[ -f ${BUILD_DIR_DEBUG}/Makefile ] || (cd ${BUILD_DIR_DEBUG} && cmake -DCMAKE_BUILD_TYPE=DEBUG ${CONFIGURE_ARGS} ..) +clean-release clean-test clean-debug clean-coverage: + @if [ -d $(OUTPUT_DIR) ]; then \ + $(MAKE) -C $(OUTPUT_DIR) $(CLEAN_ARGS) clean; \ + else \ + echo Nothing to clean; \ + fi -configure-coverage: - @[ -d ${BUILD_DIR_COVERAGE} ] || mkdir -p ${BUILD_DIR_COVERAGE} - @[ -f ${BUILD_DIR_COVERAGE}/Makefile ] || (cd ${BUILD_DIR_COVERAGE} && cmake -DCMAKE_BUILD_TYPE=COVERAGE ${CONFIGURE_ARGS} ..) +clean: clean-release -build: configure - @cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all +clean-all: clean-release clean-test clean-debug clean-coverage -build-test: configure-test - @cmake --build ${BUILD_DIR_TEST} ${BUILD_ARGS} --target all - -build-debug: configure-debug - @cmake --build ${BUILD_DIR_DEBUG} ${BUILD_ARGS} --target all - -build-coverage: configure-coverage - @cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all - -package: build - @mkdir -p ${BUILD_DIR}/$@/bin - @mkdir -p ${BUILD_DIR}/$@/etc - @mkdir -p ${BUILD_DIR}/$@/lib - @mkdir -p ${BUILD_DIR}/$@/htdocs - @mkdir -p ${BUILD_DIR}/$@/var - @cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget - @if [ "${DEST}" != "${BUILD_DIR}" ]; then \ - mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \ - fi +distclean: clean-all -package-test: build-test - @mkdir -p ${BUILD_DIR_TEST}/$@/bin - @mkdir -p ${BUILD_DIR_TEST}/$@/etc - @mkdir -p ${BUILD_DIR_TEST}/$@/lib - @mkdir -p ${BUILD_DIR_TEST}/$@/htdocs - @mkdir -p ${BUILD_DIR_TEST}/$@/var - @cmake --build ${BUILD_DIR_TEST} ${PACKAGE_ARGS} --target widget - @cmake --build ${BUILD_DIR_TEST} ${PACKAGE_ARGS} --target test_widget - @if [ "${DEST}" != "${BUILD_DIR_TEST}" ]; then \ - mkdir -p ${DEST} && cp ${BUILD_DIR_TEST}/*.wgt ${DEST}; \ +configure-release configure-test configure-debug configure-coverage: + @mkdir -p $(OUTPUT_DIR) + @if [ ! -f $(OUTPUT_DIR)/Makefile ]; then \ + (cd $(OUTPUT_DIR) && cmake -S $(ROOT_DIR) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) $(CONFIGURE_ARGS)); \ fi -package-debug: build-debug - @mkdir -p ${BUILD_DIR_DEBUG}/$@/bin - @mkdir -p ${BUILD_DIR_DEBUG}/$@/etc - @mkdir -p ${BUILD_DIR_DEBUG}/$@/lib - @mkdir -p ${BUILD_DIR_DEBUG}/$@/htdocs - @mkdir -p ${BUILD_DIR_DEBUG}/$@/var - @cmake --build ${BUILD_DIR_DEBUG} ${PACKAGE_ARGS} --target widget - @if [ "${DEST}" != "${BUILD_DIR_DEBUG}" ]; then \ - mkdir -p ${DEST} && cp ${BUILD_DIR_DEBUG}/*.wgt ${DEST}; \ - fi +configure: configure-release + +build-release build-debug build-coverage: build-%: configure-% + @cmake --build $(OUTPUT_DIR) $(BUILD_ARGS) --target all -package-coverage: build-coverage - @mkdir -p ${BUILD_DIR_COVERAGE}/$@/bin - @mkdir -p ${BUILD_DIR_COVERAGE}/$@/etc - @mkdir -p ${BUILD_DIR_COVERAGE}/$@/lib - @mkdir -p ${BUILD_DIR_COVERAGE}/$@/htdocs - @mkdir -p ${BUILD_DIR_COVERAGE}/$@/var - @cmake --build ${BUILD_DIR_COVERAGE} ${PACKAGE_ARGS} --target widget - @if [ "${DEST}" != "${BUILD_DIR_COVERAGE}" ]; then \ - mkdir -p ${DEST} && cp ${BUILD_DIR_COVERAGE}/*.wgt ${DEST}; \ +# Kept for consistency, empty to avoid building everything for test widget +build-test: configure-test + +build: build-release + +build-all: build-release build-debug build-test build-coverage + +package-release package-debug package-coverage: package-%: build-% + @cmake --build $(OUTPUT_DIR) $(PACKAGE_ARGS) --target widget + @if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \ + mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \ fi -package-coverage-test: build-coverage - @mkdir -p ${BUILD_DIR_COVERAGE_TEST}/$@/bin - @mkdir -p ${BUILD_DIR_COVERAGE_TEST}/$@/etc - @mkdir -p ${BUILD_DIR_COVERAGE_TEST}/$@/lib - @mkdir -p ${BUILD_DIR_COVERAGE_TEST}/$@/htdocs - @mkdir -p ${BUILD_DIR_COVERAGE_TEST}/$@/var - @cmake --build ${BUILD_DIR_COVERAGE_TEST} ${PACKAGE_ARGS} --target widget - @cmake --build ${BUILD_DIR_COVERAGE_TEST} ${PACKAGE_ARGS} --target test_widget - @if [ "${DEST}" != "${BUILD_DIR_COVERAGE_TEST}" ]; then \ - mkdir -p ${DEST} && cp ${BUILD_DIR_COVERAGE_TEST}/*.wgt ${DEST}; \ +package-test: build-test + @cmake --build $(OUTPUT_DIR) $(PACKAGE_ARGS) --target test_widget + @if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \ + mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \ fi +package: package-release -package-debug-test: build-debug - @mkdir -p ${BUILD_DIR_DEBUG_TEST}/$@/bin - @mkdir -p ${BUILD_DIR_DEBUG_TEST}/$@/etc - @mkdir -p ${BUILD_DIR_DEBUG_TEST}/$@/lib - @mkdir -p ${BUILD_DIR_DEBUG_TEST}/$@/htdocs - @mkdir -p ${BUILD_DIR_DEBUG_TEST}/$@/var - @cmake --build ${BUILD_DIR_DEBUG_TEST} ${PACKAGE_ARGS} --target widget - @cmake --build ${BUILD_DIR_DEBUG_TEST} ${PACKAGE_ARGS} --target test_widget - @if [ "${DEST}" != "${BUILD_DIR_DEBUG_TEST}" ]; then \ - mkdir -p ${DEST} && cp ${BUILD_DIR_DEBUG_TEST}/*.wgt ${DEST}; \ - fi +package-all: package-release package-test package-coverage package-debug -package-all: package package-test package-coverage package-debug +update: configure + @cmake --build $(BUILD_DIR) --target autobuild install: build - @cmake --build ${BUILD_DIR} ${INSTALL_ARGS} --target install + @cmake --build $(BUILD_DIR) $(INSTALL_ARGS) --target install diff --git a/binding/media-manager.c b/binding/media-manager.c index 8e1ac69..310f581 100644 --- a/binding/media-manager.c +++ b/binding/media-manager.c @@ -393,7 +393,7 @@ gint media_lists_get(MediaDevice_t* mdev, gchar **error) MediaList_t *mlist = NULL; ScanFilter_t *filters = NULL; gint ret = -1; - gint scaned_media = 0; + gint scanned_media = 0; gint i = 0; if(!mdev) @@ -418,16 +418,11 @@ gint media_lists_get(MediaDevice_t* mdev, gchar **error) free(mdev->lists[i]); mdev->lists[i] = NULL; } else { - scaned_media += ret; + scanned_media += ret; } } } - if(scaned_media == 0) - { - *error = g_strdup("No media found!"); - return -1; - } - LOGD("\n\tscanned media: %d\n",scaned_media); - return scaned_media; -}
\ No newline at end of file + LOGD("\n\tscanned media: %d\n",scanned_media); + return scanned_media; +} diff --git a/conf.d/wgt/config.xml.in b/conf.d/wgt/config.xml.in index dcdfeb0..2193fdf 100644 --- a/conf.d/wgt/config.xml.in +++ b/conf.d/wgt/config.xml.in @@ -10,6 +10,7 @@ <feature name="urn:AGL:widget:required-permission"> <param name="urn:AGL:permission::public:hidden" value="required" /> <param name="urn:AGL:permission::public:no-htdocs" value="required" /> + <param name="urn:AGL:permission::system:run-by-default" value="required" /> <param name="http://tizen.org/privilege/internal/dbus" value="required" /> </feature> diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt new file mode 100644 index 0000000..8d8fbdc --- /dev/null +++ b/test/CMakeLists.txt @@ -0,0 +1,28 @@ +########################################################################### +# Copyright 2020 Fujitsu +# +# author: Li Xiaoming <lixm.fnst@cn.fujitsu.com> +# +# 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. +########################################################################### + + +# Include any directory not starting with _ +# ----------------------------------------------------- +PROJECT_SUBDIRS_ADD(${PROJECT_SRC_DIR_PATTERN}) + +ADD_TEST(NAME AGL_SERVICE_GPS_TESTS + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND afm-test ${CMAKE_BINARY_DIR}/package ${CMAKE_BINARY_DIR}/package-test + ) + diff --git a/test/afb-test/CMakeLists.txt b/test/afb-test/CMakeLists.txt new file mode 100644 index 0000000..4adafb0 --- /dev/null +++ b/test/afb-test/CMakeLists.txt @@ -0,0 +1,21 @@ +########################################################################### +# Copyright 2020 Fujitsu +# +# author: Li Xiaoming <lixm.fnst@cn.fujitsu.com> +# +# 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. +########################################################################### + +# Include any directory not starting with _ +# ----------------------------------------------------- +PROJECT_SUBDIRS_ADD(${PROJECT_SRC_DIR_PATTERN}) diff --git a/test/afb-test/etc/CMakeLists.txt b/test/afb-test/etc/CMakeLists.txt new file mode 100644 index 0000000..2c59c7a --- /dev/null +++ b/test/afb-test/etc/CMakeLists.txt @@ -0,0 +1,32 @@ +########################################################################### +# Copyright 2020 Fujitsu +# +# author: Li Xiaoming <lixm.fnst@cn.fujitsu.com> +# +# 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. +########################################################################### + +################################################## +# mediascanner test configuration files +################################################## +PROJECT_TARGET_ADD(afb-test-config) + + file(GLOB CONF_FILES "*.json") + + add_input_files("${CONF_FILES}") + + SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES + LABELS "TEST-CONFIG" + OUTPUT_NAME ${TARGET_NAME} + ) + diff --git a/test/afb-test/etc/aft-agl-mediascanner.json b/test/afb-test/etc/aft-agl-mediascanner.json new file mode 100644 index 0000000..cebae98 --- /dev/null +++ b/test/afb-test/etc/aft-agl-mediascanner.json @@ -0,0 +1,22 @@ +{ + "id": "http://iot.bzh/download/public/schema/json/ctl-schema.json#", + "": "http://iot.bzh/download/public/schema/json/ctl-schema.json#", + "metadata": { + "uid": "Test", + "version": "1.0", + "api": "aft-mediascanner", + "info": "AFB-test binding configuration file to test mediascanner api.", + "require": [ + "mediascanner" + ] + }, + "testVerb": { + "uid": "launch_all_tests", + "info": "Launch all the tests", + "action": "lua://AFT#_launch_test", + "args": { + "trace": "mediascanner", + "files": ["mediascanner.lua"] + } + } +} diff --git a/test/afb-test/tests/CMakeLists.txt b/test/afb-test/tests/CMakeLists.txt new file mode 100644 index 0000000..768c6c0 --- /dev/null +++ b/test/afb-test/tests/CMakeLists.txt @@ -0,0 +1,31 @@ +########################################################################### +# Copyright 2020 Fujitsu +# +# author:Li Xiaoming <lixm.fnst@cn.fujitsu.com> +# +# 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. +########################################################################### + +################################################## +# mediascanner Lua Scripts +################################################## +PROJECT_TARGET_ADD(test-files) + + file(GLOB LUA_FILES "*.lua" "*.sh") + add_input_files("${LUA_FILES}") + + SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES + LABELS "TEST-DATA" + OUTPUT_NAME ${TARGET_NAME} + ) + diff --git a/test/afb-test/tests/mediascanner.lua b/test/afb-test/tests/mediascanner.lua new file mode 100644 index 0000000..4f7460f --- /dev/null +++ b/test/afb-test/tests/mediascanner.lua @@ -0,0 +1,26 @@ +--[[ + Copyright 2020 Fujitsu + + author: Li Xiaoming <lixm.fnst@cn.fujitsu.com> + + 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. +--]] + + +_AFT.testVerbStatusSuccess('testMedia_resultSuccess','mediascanner','media_result', {}) + +_AFT.testVerbStatusSuccess('testSubscribeAddSuccess','mediascanner','subscribe', {value="media_added"}) +_AFT.testVerbStatusSuccess('testSubscribeRemoveSuccess','mediascanner','subscribe', {value="media_removed"}) + +_AFT.testVerbStatusSuccess('testUnsubscribeAddSuccess','mediascanner','unsubscribe', {value="media_added"}) +_AFT.testVerbStatusSuccess('testUnsubscribeRemoveSuccess','mediascanner','unsubscribe', {value="media_removed"})
\ No newline at end of file |