CELIX-274: Merge remote-tracking branch 'remotes/origin/feature/CELIX-274_mutiple_frameworks' into develop
Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/ae8bd202 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/ae8bd202 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/ae8bd202 Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service Commit: ae8bd2023f7ed3aba7aedae4630ad11666dcd484 Parents: 0da1bec 32b1d86 Author: Pepijn Noltes <[email protected]> Authored: Tue Oct 13 19:43:38 2015 +0200 Committer: Pepijn Noltes <[email protected]> Committed: Tue Oct 13 19:43:38 2015 +0200 ---------------------------------------------------------------------- framework/CMakeLists.txt | 8 +++ framework/tst/CMakeLists.txt | 30 +++++++++ framework/tst/config.properties.in | 2 + framework/tst/framework1.properties.in | 3 + framework/tst/framework2.properties.in | 3 + framework/tst/multiple_frameworks_test.cpp | 88 +++++++++++++++++++++++++ framework/tst/run_tests.cpp | 9 +++ framework/tst/single_framework_test.cpp | 69 +++++++++++++++++++ 8 files changed, 212 insertions(+) ----------------------------------------------------------------------
