From 25afec5599ee4c7db47a2685da547dde32f886af Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Fri, 15 Jun 2018 13:43:19 +0200 Subject: [PATCH] Add test_fz --- .travis/script.sh | 3 +++ makefiles/Makefile.cpp.mk | 2 ++ makefiles/Makefile.test.mk | 5 +++++ 3 files changed, 10 insertions(+) diff --git a/.travis/script.sh b/.travis/script.sh index f50c734d13..7371d045af 100755 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -47,6 +47,9 @@ if [ "${BUILDER}" == make ];then make third_party make "${LANGUAGE}" make test_"${LANGUAGE}" + if [ "${LANGUAGE}" == cc ]; then + make test_fz + fi else # Linux Docker Makefile build: echo "NOT SUPPORTED" diff --git a/makefiles/Makefile.cpp.mk b/makefiles/Makefile.cpp.mk index e12d06f922..2438ddaccd 100755 --- a/makefiles/Makefile.cpp.mk +++ b/makefiles/Makefile.cpp.mk @@ -23,6 +23,8 @@ endif cc: ortoolslibs ccexe .PHONY: test_cc # Test C++ OR-Tools using various examples. test_cc: test_cc_examples +.PHONY: test_fz +test_fz: test_fz_examples BUILT_LANGUAGES += C++ MISSING_BUILD_DIRECTORIES = \ diff --git a/makefiles/Makefile.test.mk b/makefiles/Makefile.test.mk index 4e6e95f413..f8f7da2d2f 100755 --- a/makefiles/Makefile.test.mk +++ b/makefiles/Makefile.test.mk @@ -8,6 +8,11 @@ test_cc_examples: cc $(BIN_DIR)$Sinteger_programming$E $(BIN_DIR)$Stsp$E +.PHONY: test_fz_examples +test_fz_examples: fz + $(BIN_DIR)$Sfz$E $(EX_DIR)$Sflatzinc$Sgolomb.fzn + $(BIN_DIR)$Sfz$E $(EX_DIR)$Sflatzinc$Salpha.fzn + .PHONY: test_python_examples test_python_examples: python $(SET_PYTHONPATH) "$(PYTHON_EXECUTABLE)" $(EX_DIR)$Spython$Shidato_table.py