From f6899b392a3dd920ff7093d4deeab9a960575d55 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 14 Mar 2019 10:27:51 +0100 Subject: [PATCH] Try to make tests succeed with coverage on Jenkins. Increase timeout, and disallow parallel run. --- examples/deprecated/msg/mc/CMakeLists.txt | 4 ++++ examples/deprecated/msg/mc/bugged1_liveness_visited.tesh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/examples/deprecated/msg/mc/CMakeLists.txt b/examples/deprecated/msg/mc/CMakeLists.txt index 264f2352e3..c9cc7ed9d8 100644 --- a/examples/deprecated/msg/mc/CMakeLists.txt +++ b/examples/deprecated/msg/mc/CMakeLists.txt @@ -33,6 +33,10 @@ if(SIMGRID_HAVE_MC) ADD_TEST(mc-bugged1-liveness-stack-cleaner ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/mc/bugged1_liveness_stack_cleaner ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/mc/ ${CMAKE_BINARY_DIR}/examples/deprecated/msg/mc/) ENDIF() ENDIF() + + if (enable_coverage) + SET_TESTS_PROPERTIES(mc-bugged1-liveness-visited-ucontext PROPERTIES RUN_SERIAL "TRUE") + endif() endif() set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/bugged1.tesh diff --git a/examples/deprecated/msg/mc/bugged1_liveness_visited.tesh b/examples/deprecated/msg/mc/bugged1_liveness_visited.tesh index 971ad4c828..f8c45844da 100644 --- a/examples/deprecated/msg/mc/bugged1_liveness_visited.tesh +++ b/examples/deprecated/msg/mc/bugged1_liveness_visited.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! expect return 2 -! timeout 20 +! timeout 30 ! output ignore $ ${bindir:=.}/../../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=.}/../../../platforms/small_platform.xml ${srcdir:=.}/deploy_bugged1_liveness_visited.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=model-check/visited:100 --cfg=contexts/stack-size:256 --cfg=model-check/property:promela_bugged1_liveness > [ 0.000000] (0:maestro@) Check the liveness property promela_bugged1_liveness -- 2.20.1