Fix test folder structureneedlefish_13.93.0needlefish/13.93.0marlin_12.93.0marlin_12.92.0marlin_12.91.0marlin_12.90.1marlin_12.90.0marlin/12.93.0marlin/12.92.0marlin/12.91.0marlin/12.90.1marlin/12.90.0lamprey_11.92.0lamprey_11.91.0lamprey/11.92.0lamprey/11.91.0koi_10.93.0koi_10.92.0koi_10.91.0koi/10.93.0koi/10.92.0koi/10.91.0jellyfish_9.99.4jellyfish_9.99.3jellyfish_9.99.2jellyfish/9.99.4jellyfish/9.99.3jellyfish/9.99.29.99.49.99.39.99.213.93.012.93.012.92.012.91.012.90.112.90.011.92.011.91.010.93.010.92.010.91.0

The test folder should rest in the root of a package.

Bug-AGL: SPEC-2807

Change-Id: I6e44e68f40aaf58d2c59973e6a2413947dcb4eaf
Signed-off-by: Li, Xiaoming <lixm.fnst@cn.fujitsu.com>

2 files changed, 254 insertions, 0 deletions

diff --git a/autobuild/agl/autobuild b/autobuild/agl/autobuild
new file mode 100644
index 0000000..a7c25ae
--- /dev/null
+++ b/autobuild/agl/autobuild
@@ -0,0 +1,127 @@
+#!/usr/bin/make -f
+# Copyright (C) 2015 - 2018 "IoT.bzh"
+# Author "Romain Forlot" <romain.forlot@iot.bzh>
+#
+# 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.
+
+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)
+DEST      := ${BUILD_DIR}
+
+.PHONY: all clean distclean configure build package help configure-debug configure-coverage build-debug build-coverage package-test package-debug package-coverage package-debug package-all
+
+all: help
+
+help:
+	@echo "List of targets available:"
+	@echo ""
+	@echo "- all"
+	@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 ""
+	@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"
+
+clean:
+	@([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} ${CLEAN_ARGS} clean) || echo Nothing to clean
+
+distclean:
+	@[ -d ${DEST} ] && find ${DEST} -name "*.wgt" -delete
+	@rm -rf ${BUILD_DIR}
+
+configure:
+	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
+	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CONFIGURE_ARGS} ..)
+
+configure-test:
+	@[ -d ${BUILD_DIR_TEST} ] || mkdir -p ${BUILD_DIR_TEST}
+	@[ -f ${BUILD_DIR_TEST}/Makefile ] || (cd ${BUILD_DIR_TEST} && cmake ${CONFIGURE_ARGS} ..)
+
+configure-debug:
+	@[ -d ${BUILD_DIR_DEBUG} ] || mkdir -p ${BUILD_DIR_DEBUG}
+	@[ -f ${BUILD_DIR_DEBUG}/Makefile ] || (cd ${BUILD_DIR_DEBUG} && cmake ${CONFIGURE_ARGS} ..)
+
+configure-coverage:
+	@[ -d ${BUILD_DIR_COVERAGE} ] || mkdir -p ${BUILD_DIR_COVERAGE}
+	@[ -f ${BUILD_DIR_COVERAGE}/Makefile ] || (cd ${BUILD_DIR_COVERAGE} && cmake ${CONFIGURE_ARGS} ..)
+
+build: configure
+	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
+
+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_COVERAGE} ${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
+
+package-test: build-test
+	@mkdir -p ${BUILD_DIR_TEST}/package/bin
+	@mkdir -p ${BUILD_DIR_TEST}/package/etc
+	@mkdir -p ${BUILD_DIR_TEST}/package/lib
+	@mkdir -p ${BUILD_DIR_TEST}/package/htdocs
+	@mkdir -p ${BUILD_DIR_TEST}/package/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}; \
+	fi
+
+package-test: build-test
+	@mkdir -p ${BUILD_DIR_DEBUG}/package/bin
+	@mkdir -p ${BUILD_DIR_DEBUG}/package/etc
+	@mkdir -p ${BUILD_DIR_DEBUG}/package/lib
+	@mkdir -p ${BUILD_DIR_DEBUG}/package/htdocs
+	@mkdir -p ${BUILD_DIR_DEBUG}/package/var
+	@cmake --build ${BUILD_DIR_DEBUG} ${PACKAGE_ARGS} --target widget
+	@cmake --build ${BUILD_DIR_DEBUG} ${PACKAGE_ARGS} --target test_widget
+	@if [ "${DEST}" != "${BUILD_DIR_DEBUG}" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR_DEBUG}/*.wgt ${DEST}; \
+	fi
+
+package-coverage: build-coverage
+	@mkdir -p ${BUILD_DIR_COVERAGE}/package/bin
+	@mkdir -p ${BUILD_DIR_COVERAGE}/package/etc
+	@mkdir -p ${BUILD_DIR_COVERAGE}/package/lib
+	@mkdir -p ${BUILD_DIR_COVERAGE}/package/htdocs
+	@mkdir -p ${BUILD_DIR_COVERAGE}/package/var
+	@cmake --build ${BUILD_DIR_COVERAGE} ${PACKAGE_ARGS} --target widget
+	@cmake --build ${BUILD_DIR_COVERAGE} ${PACKAGE_ARGS} --target test_widget
+	@if [ "${DEST}" != "${BUILD_DIR_COVERAGE}" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR_COVERAGE}/*.wgt ${DEST}; \
+	fi
+
+package-all: package package-test package-coverage package-debug
+
+install: build
+	@cmake --build ${BUILD_DIR} ${INSTALL_ARGS} --target install
diff --git a/autobuild/linux/autobuild b/autobuild/linux/autobuild
new file mode 100644
index 0000000..a7c25ae
--- /dev/null
+++ b/autobuild/linux/autobuild
@@ -0,0 +1,127 @@
+#!/usr/bin/make -f
+# Copyright (C) 2015 - 2018 "IoT.bzh"
+# Author "Romain Forlot" <romain.forlot@iot.bzh>
+#
+# 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.
+
+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)
+DEST      := ${BUILD_DIR}
+
+.PHONY: all clean distclean configure build package help configure-debug configure-coverage build-debug build-coverage package-test package-debug package-coverage package-debug package-all
+
+all: help
+
+help:
+	@echo "List of targets available:"
+	@echo ""
+	@echo "- all"
+	@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 ""
+	@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"
+
+clean:
+	@([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} ${CLEAN_ARGS} clean) || echo Nothing to clean
+
+distclean:
+	@[ -d ${DEST} ] && find ${DEST} -name "*.wgt" -delete
+	@rm -rf ${BUILD_DIR}
+
+configure:
+	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
+	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CONFIGURE_ARGS} ..)
+
+configure-test:
+	@[ -d ${BUILD_DIR_TEST} ] || mkdir -p ${BUILD_DIR_TEST}
+	@[ -f ${BUILD_DIR_TEST}/Makefile ] || (cd ${BUILD_DIR_TEST} && cmake ${CONFIGURE_ARGS} ..)
+
+configure-debug:
+	@[ -d ${BUILD_DIR_DEBUG} ] || mkdir -p ${BUILD_DIR_DEBUG}
+	@[ -f ${BUILD_DIR_DEBUG}/Makefile ] || (cd ${BUILD_DIR_DEBUG} && cmake ${CONFIGURE_ARGS} ..)
+
+configure-coverage:
+	@[ -d ${BUILD_DIR_COVERAGE} ] || mkdir -p ${BUILD_DIR_COVERAGE}
+	@[ -f ${BUILD_DIR_COVERAGE}/Makefile ] || (cd ${BUILD_DIR_COVERAGE} && cmake ${CONFIGURE_ARGS} ..)
+
+build: configure
+	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
+
+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_COVERAGE} ${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
+
+package-test: build-test
+	@mkdir -p ${BUILD_DIR_TEST}/package/bin
+	@mkdir -p ${BUILD_DIR_TEST}/package/etc
+	@mkdir -p ${BUILD_DIR_TEST}/package/lib
+	@mkdir -p ${BUILD_DIR_TEST}/package/htdocs
+	@mkdir -p ${BUILD_DIR_TEST}/package/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}; \
+	fi
+
+package-test: build-test
+	@mkdir -p ${BUILD_DIR_DEBUG}/package/bin
+	@mkdir -p ${BUILD_DIR_DEBUG}/package/etc
+	@mkdir -p ${BUILD_DIR_DEBUG}/package/lib
+	@mkdir -p ${BUILD_DIR_DEBUG}/package/htdocs
+	@mkdir -p ${BUILD_DIR_DEBUG}/package/var
+	@cmake --build ${BUILD_DIR_DEBUG} ${PACKAGE_ARGS} --target widget
+	@cmake --build ${BUILD_DIR_DEBUG} ${PACKAGE_ARGS} --target test_widget
+	@if [ "${DEST}" != "${BUILD_DIR_DEBUG}" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR_DEBUG}/*.wgt ${DEST}; \
+	fi
+
+package-coverage: build-coverage
+	@mkdir -p ${BUILD_DIR_COVERAGE}/package/bin
+	@mkdir -p ${BUILD_DIR_COVERAGE}/package/etc
+	@mkdir -p ${BUILD_DIR_COVERAGE}/package/lib
+	@mkdir -p ${BUILD_DIR_COVERAGE}/package/htdocs
+	@mkdir -p ${BUILD_DIR_COVERAGE}/package/var
+	@cmake --build ${BUILD_DIR_COVERAGE} ${PACKAGE_ARGS} --target widget
+	@cmake --build ${BUILD_DIR_COVERAGE} ${PACKAGE_ARGS} --target test_widget
+	@if [ "${DEST}" != "${BUILD_DIR_COVERAGE}" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR_COVERAGE}/*.wgt ${DEST}; \
+	fi
+
+package-all: package package-test package-coverage package-debug
+
+install: build
+	@cmake --build ${BUILD_DIR} ${INSTALL_ARGS} --target install