summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAina Niemetz <aina.niemetz@gmail.com>2019-10-03 12:41:40 -0700
committerGitHub <noreply@github.com>2019-10-03 12:41:40 -0700
commit76ddd08e3805ca262d732ce78db165272ef0852e (patch)
tree9ead024a7cc2c800f5f50c9447e2ba377068d2fb
parent24ad028cdd3f72b5c9123e9718c63e7613e0a841 (diff)
Travis: Reenable building and running of examples. (#3351)
-rw-r--r--.travis.yml29
-rw-r--r--examples/CMakeLists.txt2
2 files changed, 20 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml
index 64dd17c75..505c69c54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,21 +57,28 @@ script:
exit 1;
}
makeCheck() {
- cd build
- make -j2 check ARGS='-LE regress[1-4]' CVC4_REGRESSION_ARGS='--no-early-exit' || error "BUILD/UNIT/SYSTEM/REGRESSION TEST FAILED"
+ (
+ cd build
+ make -j2 check ARGS='-LE regress[1-4]' CVC4_REGRESSION_ARGS='--no-early-exit' || error "BUILD/UNIT/SYSTEM/REGRESSION TEST FAILED"
+ )
}
makeExamples() {
- cd examples
- mkdir build
- cd build
- cmake .. -DCMAKE_PREFIX_PATH=$(pwd)/../../build/install/lib/cmake
- ctest -j2 --output-on-failure || error "RUNNING EXAMPLES FAILED"
+ (
+ cd examples
+ mkdir build
+ cd build
+ cmake .. -DCMAKE_PREFIX_PATH=$(pwd)/../../build/install/lib/cmake
+ make -j2
+ ctest -j2 --output-on-failure || error "RUNNING EXAMPLES FAILED"
+ )
}
makeInstallCheck() {
- cd build
- make install -j2
- echo -e "#include <cvc4/cvc4.h>\nint main() { CVC4::ExprManager em; return 0; }" > /tmp/test.cpp
- $CXX -std=c++11 /tmp/test.cpp -I install/include -L install/lib -lcvc4 -lcln || exit 1
+ (
+ cd build
+ make install -j2
+ echo -e "#include <cvc4/cvc4.h>\nint main() { CVC4::ExprManager em; return 0; }" > /tmp/test.cpp
+ $CXX -std=c++11 /tmp/test.cpp -I install/include -L install/lib -lcvc4 -lcln || exit 1
+ )
}
run() {
echo "travis_fold:start:$1"
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 43f4109a3..893ea5c95 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.2)
project(cvc4-examples)
+set(CMAKE_CXX_STANDARD 11)
+
enable_testing()
# Find CVC4 package. If CVC4 is not installed into the default system location
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback