From 3067473d780e1651804c37f3475dce96e49a7e95 Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Sat, 11 Apr 2015 23:00:47 +0200 Subject: Move tests inclusion in a test CMakeList The root CMakeList was including every test directories directly, although it should be kept simple. Move the inclusions to a dedicated CMakeList in test. Signed-off-by: Kevin Rocard --- CMakeLists.txt | 6 +----- test/CMakeLists.txt | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 test/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 37a9ffa..fbff0d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,11 +65,7 @@ function(set_test_env TestName) PYTHONPATH=${CMAKE_BINARY_DIR}/bindings/python:$ENV{PYTHONPATH}) endfunction() -add_subdirectory(test/test-platform) -add_subdirectory(test/test-fixed-point-parameter) -add_subdirectory(test/tokenizer) -add_subdirectory(test/functional-tests) -add_subdirectory(test/test-subsystem) +add_subdirectory(test) option(BASH_COMPLETION "Install bash completion configuration" ON) if (BASH_COMPLETION) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt new file mode 100644 index 0000000..8efd0d7 --- /dev/null +++ b/test/CMakeLists.txt @@ -0,0 +1,33 @@ +# Copyright (c) 2014-2015, Intel Corporation +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation and/or +# other materials provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors +# may be used to endorse or promote products derived from this software without +# specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +add_subdirectory(test-platform) +add_subdirectory(test-fixed-point-parameter) +add_subdirectory(tokenizer) +add_subdirectory(functional-tests) +add_subdirectory(test-subsystem) -- cgit v1.1