From 4c0cc910bbfbabe8b379b27d283f27d397a2c8dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Rombauts?= Date: Thu, 26 Mar 2015 17:54:38 +0100 Subject: [PATCH] Simplify scripts following changes to paths of the example --- .travis.yml | 2 -- build.bat | 7 ++----- build.sh | 6 ++---- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 05738dc..bf02202 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/build.bat b/build.bat index cb8062a..fcc72a6 100644 --- a/build.bat +++ b/build.bat @@ -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 .. diff --git a/build.sh b/build.sh index 5cd6e72..7d3068c 100755 --- a/build.sh +++ b/build.sh @@ -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