From ead6e56d15432384ece80361dd1969c2367a0fe2 Mon Sep 17 00:00:00 2001 From: Dan Liew Date: Sun, 15 Oct 2017 17:41:40 +0100 Subject: [PATCH] [TravisCI] Swap `run_quiet` and `run_non_native_binding`. In the previous order `grep` inside `run_quiet` would get ASan LD_PRELOAD'ed which would sometimes fail. --- contrib/ci/scripts/test_z3_examples_cmake.sh | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/contrib/ci/scripts/test_z3_examples_cmake.sh b/contrib/ci/scripts/test_z3_examples_cmake.sh index 515027509..9979b8773 100755 --- a/contrib/ci/scripts/test_z3_examples_cmake.sh +++ b/contrib/ci/scripts/test_z3_examples_cmake.sh @@ -68,17 +68,17 @@ if [ "X${PYTHON_BINDINGS}" = "X1" ]; then # Too slow when doing ASan Debug build echo "Skipping all_interval_series.py under ASan Debug build" else - run_non_native_binding run_quiet ${PYTHON_EXECUTABLE} python/all_interval_series.py + run_quiet run_non_native_binding ${PYTHON_EXECUTABLE} python/all_interval_series.py fi - run_non_native_binding run_quiet ${PYTHON_EXECUTABLE} python/complex.py - run_non_native_binding run_quiet ${PYTHON_EXECUTABLE} python/example.py + run_quiet run_non_native_binding ${PYTHON_EXECUTABLE} python/complex.py + run_quiet run_non_native_binding ${PYTHON_EXECUTABLE} python/example.py # FIXME: `hamiltonian.py` example is disabled because its too slow. #${PYTHON_EXECUTABLE} python/hamiltonian.py - run_non_native_binding run_quiet ${PYTHON_EXECUTABLE} python/marco.py - run_non_native_binding run_quiet ${PYTHON_EXECUTABLE} python/mss.py - run_non_native_binding run_quiet ${PYTHON_EXECUTABLE} python/socrates.py - run_non_native_binding run_quiet ${PYTHON_EXECUTABLE} python/visitor.py - run_non_native_binding run_quiet ${PYTHON_EXECUTABLE} python/z3test.py + run_quiet run_non_native_binding ${PYTHON_EXECUTABLE} python/marco.py + run_quiet run_non_native_binding ${PYTHON_EXECUTABLE} python/mss.py + run_quiet run_non_native_binding ${PYTHON_EXECUTABLE} python/socrates.py + run_quiet run_non_native_binding ${PYTHON_EXECUTABLE} python/visitor.py + run_quiet run_non_native_binding ${PYTHON_EXECUTABLE} python/z3test.py fi if [ "X${DOTNET_BINDINGS}" = "X1" ]; then @@ -86,7 +86,7 @@ if [ "X${DOTNET_BINDINGS}" = "X1" ]; then # FIXME: Move compliation step into CMake target mcs ${Z3_SRC_DIR}/examples/dotnet/Program.cs /target:exe /out:dotnet_test.exe /reference:Microsoft.Z3.dll /r:System.Numerics.dll # Run .NET example - run_non_native_binding run_quiet mono ./dotnet_test.exe + run_quiet run_non_native_binding mono ./dotnet_test.exe fi if [ "X${JAVA_BINDINGS}" = "X1" ]; then @@ -108,8 +108,8 @@ if [ "X${JAVA_BINDINGS}" = "X1" ]; then # so don't run it for now. echo "Skipping JavaExample under ASan build" else - run_non_native_binding \ - run_quiet \ + run_quiet \ + run_non_native_binding \ java -cp .:examples/java:com.microsoft.z3.jar JavaExample fi fi