Changes have been pushed for the repository "fawkesrobotics/fawkes".
Clone: https://github.com/fawkesrobotics/fawkes.git Gitweb: https://github.com/fawkesrobotics/fawkes The branch, thofmann/integration-tests has been updated discards 433b14b2769102316fe4d46413bb2782171c274e (commit) discards 174068d8fbd61c03d8a3dd312c3505083b914b8c (commit) discards 51d05f2e5c7974b2c126653c5fd7902b44c09fc9 (commit) discards e2a753596197d4766dc24752c87fc5d43c1c29b8 (commit) discards a2fdf956ef0f901b22c3ffe8bcf94e8c35f9a1dc (commit) discards a08cd86a6db5ae0f02c83f035ec076887b2ee66e (commit) discards 1bba742ed97533fd2ba06881fdff176b67394d29 (commit) to b43170bdb002df08d4233e687e3ccf4e5427deb4 (commit) via ab32aa565c2c3d3710888a1c7a76f010d01e141f (commit) via f85e49e2b870ff14d81dd6ff2de7b7fa16823291 (commit) via 8205e5237eae139e05bb9f6a8a9082bae699df0b (commit) via 9e673af6fbc6ca50cbf10e796f70b618d233444b (commit) via 57abc8fd7c4e333e433bf828033dad8a6a1c1c17 (commit) via 8adcad714507a02c9fe5e295999ca0b33f2d4846 (commit) via 6a006f7b19f468b35e6e01c74b55bfcb6c2e6c0d (commit) via 904c3cf284295a8d99df0ea8675ed4db94debf63 (commit) via c0e2c4a5bbb4ff0a154b623e211c2a90464515bf (commit) via 57eb9bf60bb9c93cd461cc4016bee7e6544ac821 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (433b14b2769102316fe4d46413bb2782171c274e) \ N -- N -- N (b43170bdb002df08d4233e687e3ccf4e5427deb4) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. https://github.com/fawkesrobotics/fawkes/tree/thofmann/integration-tests Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --------------------------------------------------------------- commit 8adcad714507a02c9fe5e295999ca0b33f2d4846 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Sun Jun 23 13:51:01 2019 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Mar 19 16:59:46 2020 +0100 clips: add function binding to quit fawkes If we run tests from within CLIPS, we may want to quit if all tests have run. Support this by binding fawkes::runtime::quit() to the CLIPS function quit. https://github.com/fawkesrobotics/fawkes/commit/8adcad714 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 57abc8fd7c4e333e433bf828033dad8a6a1c1c17 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon Mar 16 09:52:57 2020 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Mar 19 16:59:46 2020 +0100 buildsys: add build target to execute all tests in tests.d The exec_testscripts target executes all executables in $(TOP_BASEDIR)/tests.d. Add the target as dependency to target test if we are in the root directory. https://github.com/fawkesrobotics/fawkes/commit/57abc8fd7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 9e673af6fbc6ca50cbf10e796f70b618d233444b Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon Mar 16 11:04:59 2020 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Mar 19 16:59:46 2020 +0100 buildsys: rename testscripts to separate integration-test target We do not want to run this as part of the regular tests, as these are only unit tests. Integration tests need to be run after all the other tests, and only from the root. https://github.com/fawkesrobotics/fawkes/commit/9e673af6f - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 8205e5237eae139e05bb9f6a8a9082bae699df0b Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon Mar 16 11:06:07 2020 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Mar 19 16:59:46 2020 +0100 buildkite: also run integration tests https://github.com/fawkesrobotics/fawkes/commit/8205e5237 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit f85e49e2b870ff14d81dd6ff2de7b7fa16823291 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon Mar 16 11:22:39 2020 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Mar 19 16:59:46 2020 +0100 buildsys: simplify integration-test target, wildcard `*` instead of `ls` This way, we do not need to prepend the path everywhere. https://github.com/fawkesrobotics/fawkes/commit/f85e49e2b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit ab32aa565c2c3d3710888a1c7a76f010d01e141f Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon Mar 16 17:42:35 2020 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Mar 19 16:59:46 2020 +0100 buildkite: upload all logs as artifacts https://github.com/fawkesrobotics/fawkes/commit/ab32aa565 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit b43170bdb002df08d4233e687e3ccf4e5427deb4 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu Mar 19 13:38:29 2020 +0100 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu Mar 19 16:59:46 2020 +0100 buildkite: set timeout for Fedora build step to 15 minutes This ensures that a non-terminating test eventually fails. The timeout may need to be increased later on. https://github.com/fawkesrobotics/fawkes/commit/b43170bdb - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- .buildkite/pipeline.yml | 2 +- src/plugins/webview/frontend/package-lock.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) - *Diffs* ------------------------------------------------------------- - *commit* 8adcad714507a02c9fe5e295999ca0b33f2d4846 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Sun Jun 23 13:51:01 2019 +0200 Subject: clips: add function binding to quit fawkes src/plugins/clips/aspect/Makefile | 2 +- src/plugins/clips/aspect/clips_env_manager.cpp | 8 ++++++++ src/plugins/clips/aspect/clips_env_manager.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) _Diff for modified files_: diff --git a/src/plugins/clips/aspect/Makefile b/src/plugins/clips/aspect/Makefile index 5ff3e5883..197520725 100644 --- a/src/plugins/clips/aspect/Makefile +++ b/src/plugins/clips/aspect/Makefile @@ -22,7 +22,7 @@ include $(BUILDSYSDIR)/clips.mk CFLAGS += $(CFLAGS_CLIPS) LDFLAGS += $(LDFLAGS_CLIPS) -LIBS_libfawkesclipsaspect = stdc++ fawkescore fawkesaspects fawkesutils +LIBS_libfawkesclipsaspect = stdc++ fawkescore fawkesaspects fawkesutils fawkesbaseapp OBJS_libfawkesclipsaspect = $(patsubst %.cpp,%.o,$(patsubst qa/%,,$(subst $(SRCDIR)/,,$(realpath $(wildcard $(SRCDIR)/*.cpp))))) OBJS_all = $(OBJS_libfawkesclipsaspect) diff --git a/src/plugins/clips/aspect/clips_env_manager.cpp b/src/plugins/clips/aspect/clips_env_manager.cpp index e256be62d..17bc839d7 100644 --- a/src/plugins/clips/aspect/clips_env_manager.cpp +++ b/src/plugins/clips/aspect/clips_env_manager.cpp @@ -20,6 +20,7 @@ * Read the full text in the LICENSE.GPL_WRE file in the doc directory. */ +#include <baseapp/run.h> #include <logging/logger.h> #include <plugins/clips/aspect/clips_env_manager.h> #include <plugins/clips/aspect/clips_feature.h> @@ -396,6 +397,7 @@ CLIPSEnvManager::add_functions(const std::string &env_name, LockPtr<CLIPS::Envir clips->add_function("now-systime", sigc::slot<CLIPS::Values>( sigc::mem_fun(*this, &CLIPSEnvManager::clips_now_systime))); + clips->add_function("quit", sigc::slot<void>(sigc::mem_fun(*this, &CLIPSEnvManager::quit))); } void @@ -508,4 +510,10 @@ CLIPSEnvManager::guarded_load(const std::string &env_name, const std::string &fi } } +void +CLIPSEnvManager::quit() +{ + fawkes::runtime::quit(); +} + } // end namespace fawkes diff --git a/src/plugins/clips/aspect/clips_env_manager.h b/src/plugins/clips/aspect/clips_env_manager.h index 4a3b002a9..358f5912b 100644 --- a/src/plugins/clips/aspect/clips_env_manager.h +++ b/src/plugins/clips/aspect/clips_env_manager.h @@ -60,6 +60,7 @@ private: CLIPS::Values clips_now(); CLIPS::Values clips_now_systime(); void guarded_load(const std::string &env_name, const std::string &filename); + void quit(); private: Logger *logger_; - *commit* 57abc8fd7c4e333e433bf828033dad8a6a1c1c17 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Mon Mar 16 09:52:57 2020 +0100 Subject: buildsys: add build target to execute all tests in tests.d etc/buildsys/root/root.mk | 1 + etc/buildsys/{catch2.mk => root/test.mk} | 33 +++++++++++++++----------------- 2 files changed, 16 insertions(+), 18 deletions(-) _Diff for modified files_: diff --git a/etc/buildsys/root/root.mk b/etc/buildsys/root/root.mk index 3fa95bca4..3c51e943a 100644 --- a/etc/buildsys/root/root.mk +++ b/etc/buildsys/root/root.mk @@ -29,6 +29,7 @@ include $(BUILDSYSDIR)/root/parallel.mk include $(BUILDSYSDIR)/root/uncolored.mk include $(BUILDSYSDIR)/root/stats.mk include $(BUILDSYSDIR)/root/git-hooks.mk +include $(BUILDSYSDIR)/root/test.mk endif # __buildsys_root_root_mk_ - *commit* 9e673af6fbc6ca50cbf10e796f70b618d233444b - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Mon Mar 16 11:04:59 2020 +0100 Subject: buildsys: rename testscripts to separate integration-test target etc/buildsys/root/test.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) _Diff for modified files_: diff --git a/etc/buildsys/root/test.mk b/etc/buildsys/root/test.mk index 08de31d15..a5b5f3fe3 100644 --- a/etc/buildsys/root/test.mk +++ b/etc/buildsys/root/test.mk @@ -13,8 +13,7 @@ # #***************************************************************************** -test: exec_testscripts -exec_testscripts: +integration-test: $(SILENT) if [ -d $(TOP_BASEDIR)/tests.d/ ] ; then \ for test in $$(ls $(TOP_BASEDIR)/tests.d/) ; do \ if [ -x $(TOP_BASEDIR)/tests.d/$$test ] ; then \ - *commit* 8205e5237eae139e05bb9f6a8a9082bae699df0b - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Mon Mar 16 11:06:07 2020 +0100 Subject: buildkite: also run integration tests .buildkite/test | 1 + 1 file changed, 1 insertion(+) _Diff for modified files_: diff --git a/.buildkite/test b/.buildkite/test index 7e5347b41..4765cd2c3 100755 --- a/.buildkite/test +++ b/.buildkite/test @@ -29,3 +29,4 @@ set -euo pipefail # Run tests $MAKE -j$NPROC test +$MAKE integration-test - *commit* f85e49e2b870ff14d81dd6ff2de7b7fa16823291 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Mon Mar 16 11:22:39 2020 +0100 Subject: buildsys: simplify integration-test target, wildcard `*` instead of `ls` etc/buildsys/root/test.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) _Diff for modified files_: diff --git a/etc/buildsys/root/test.mk b/etc/buildsys/root/test.mk index a5b5f3fe3..b19b4d517 100644 --- a/etc/buildsys/root/test.mk +++ b/etc/buildsys/root/test.mk @@ -15,12 +15,12 @@ integration-test: $(SILENT) if [ -d $(TOP_BASEDIR)/tests.d/ ] ; then \ - for test in $$(ls $(TOP_BASEDIR)/tests.d/) ; do \ - if [ -x $(TOP_BASEDIR)/tests.d/$$test ] ; then \ - echo -e $(INDENT_PRINT)"[TEST] Executing test $(TOP_BASEDIR)/tests.d/$$test"; \ - exec $(TOP_BASEDIR)/tests.d/$$test | sed s'/^/$(INDENT_PRINT)[TEST] /'; \ + for test in $(TOP_BASEDIR)/tests.d/* ; do \ + if [ -x $$test ] ; then \ + echo -e $(INDENT_PRINT)"[TEST] Executing test $$test"; \ + exec $$test | sed s'/^/$(INDENT_PRINT)[TEST] /'; \ if [ $${PIPESTATUS[0]} -ne 0 ] ; then \ - echo -e $(INDENT_PRINT)"[TEST] $(TBOLDRED)Failed test: $(TOP_BASEDIR)/tests.d/$$test$(TNORMAL)"; \ + echo -e $(INDENT_PRINT)"[TEST] $(TBOLDRED)Failed test: $$test$(TNORMAL)"; \ exit 1; \ fi \ fi \ - *commit* ab32aa565c2c3d3710888a1c7a76f010d01e141f - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Mon Mar 16 17:42:35 2020 +0100 Subject: buildkite: upload all logs as artifacts .buildkite/pipeline.yml | 2 ++ 1 file changed, 2 insertions(+) _Diff for modified files_: diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 178c40dd4..ac423d2f6 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -36,6 +36,8 @@ steps: - .buildkite/build - .buildkite/test - .buildkite/annotate + artifact_paths: + - bin/*.log plugins: - *merged-pr-plugin - docker#v3.3.0: - *commit* b43170bdb002df08d4233e687e3ccf4e5427deb4 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu Mar 19 13:38:29 2020 +0100 Subject: buildkite: set timeout for Fedora build step to 15 minutes .buildkite/pipeline.yml | 1 + 1 file changed, 1 insertion(+) _Diff for modified files_: diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index ac423d2f6..7fa2998da 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -38,6 +38,7 @@ steps: - .buildkite/annotate artifact_paths: - bin/*.log + timeout_in_minutes: 15 plugins: - *merged-pr-plugin - docker#v3.3.0: _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
