From 8a93c325209a53020b08213d35ec722b7257cbea Mon Sep 17 00:00:00 2001
From: Justin Carpentier <justin.carpentier@inria.fr>
Date: Fri, 3 Apr 2020 18:03:51 +0200
Subject: [PATCH] test/packaging: reorganization
---
.travis.yml | 8 ++++----
unittest/{ => packaging}/cmake/CMakeLists.txt | 0
unittest/{ => packaging}/cmake/extra_lib.cpp | 0
3 files changed, 4 insertions(+), 4 deletions(-)
rename unittest/{ => packaging}/cmake/CMakeLists.txt (100%)
rename unittest/{ => packaging}/cmake/extra_lib.cpp (100%)
diff --git a/.travis.yml b/.travis.yml
index a35bbdd1..fe2170c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,12 +71,12 @@ install: pip install coveralls numpy --user
script:
- export CMAKE_ADDITIONAL_OPTIONS="-DCMAKE_BUILD_TYPE=${BUILDTYPE}"
- ./.travis/run ../travis_custom/custom_build
- - cd $TRAVIS_BUILD_DIR/unittest/cmake
- - mkdir build
- - cd build
- - export CMAKE_PREFIX_PATH=/tmp/_ci/install
- export PYTHON_DEFAULT_VERSION=$(which python2)
- if [[ $TRAVIS_PYTHON_VERSION -gt 30 ]]; then export PYTHON_DEFAULT_VERSION=$(which python3); fi
+ - export CMAKE_PREFIX_PATH=/tmp/_ci/install
+ - cd $TRAVIS_BUILD_DIR/unittest/packaging/cmake
+ - mkdir build
+ - cd build
- cmake .. -DPYTHON_EXECUTABLE=$PYTHON_DEFAULT_VERSION
- make
- ./extra_lib
diff --git a/unittest/cmake/CMakeLists.txt b/unittest/packaging/cmake/CMakeLists.txt
similarity index 100%
rename from unittest/cmake/CMakeLists.txt
rename to unittest/packaging/cmake/CMakeLists.txt
diff --git a/unittest/cmake/extra_lib.cpp b/unittest/packaging/cmake/extra_lib.cpp
similarity index 100%
rename from unittest/cmake/extra_lib.cpp
rename to unittest/packaging/cmake/extra_lib.cpp
--
GitLab