Simplify scripts following changes to paths of the example

This commit is contained in:
Sébastien Rombauts 2015-03-26 17:54:38 +01:00
parent b6eb04e37c
commit 4c0cc910bb
3 changed files with 4 additions and 11 deletions

View File

@ -12,12 +12,10 @@ before_install:
- sudo apt-get install -qq cppcheck
# scripts to run before build
# using a symbolic link to get the "make test" to work as if launched from the root directorys
before_script:
- mkdir build
- cd build
- cmake -DSQLITECPP_BUILD_EXAMPLES=ON -DSQLITECPP_BUILD_TESTS=ON -DSQLITECPP_RUN_DOXYGEN=OFF ..
- ln -s ../examples examples
# build examples, and run tests (ie make & make test)
script:

View File

@ -11,10 +11,7 @@ cmake -DSQLITECPP_BUILD_EXAMPLES=ON -DSQLITECPP_BUILD_TESTS=ON ..
@REM Build default configuration (ie 'Debug')
cmake --build .
@REM prepare and launch tests
mkdir examples
mkdir examples\example1
copy ..\examples\example1\example.db3 examples\example1
copy ..\examples\example1\logo.png examples\example1
@REM Build and run tests
ctest --output-on-failure
cd ..

View File

@ -7,11 +7,9 @@ cd build
# Generate a Makefile for GCC (or Clang, depanding on CC/CXX envvar)
cmake -DSQLITECPP_BUILD_EXAMPLES=ON -DSQLITECPP_BUILD_TESTS=ON ..
# Build (ie 'make')
cmake --build .
# Prepare and run unit-tests (ie 'make test')
mkdir -p examples/example1
cp ../examples/example1/example.db3 examples/example1
cp ../examples/example1/logo.png examples/example1
# Build and run unit-tests (ie 'make test')
ctest --output-on-failure