From: Arnaud Giersch Date: Mon, 7 Nov 2011 22:14:01 +0000 (+0100) Subject: Parenthesis should be protected in test parameters. X-Git-Tag: exp_20120216~425 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7e18472f4a205887cd33cc98f2dc05974488db1c?hp=83b6eb642c9777ecc8f947d1a645cbec1874173b Parenthesis should be protected in test parameters. --- diff --git a/buildtools/Cmake/memcheck_tests.cmake b/buildtools/Cmake/memcheck_tests.cmake index b6627772cd..143b0f9926 100644 --- a/buildtools/Cmake/memcheck_tests.cmake +++ b/buildtools/Cmake/memcheck_tests.cmake @@ -81,7 +81,7 @@ ADD_TEST(memcheck-tesh-simdag-parser-sym-full-0 ${CMAKE_BINARY_DIR}/teshsuite/si ADD_TEST(memcheck-tesh-simdag-parser-sym-full-1 ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test two_clusters_symmetric.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/) ADD_TEST(memcheck-tesh-simdag-parser-sym-full-2 ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test two_hosts_one_link_symmetrical.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/) ADD_TEST(memcheck-tesh-simdag-parser-sym-full-3 ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test two_hosts_one_link_fullduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/) -ADD_TEST(memcheck-tesh-simdag-parser-sym-full-4 ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test Dijkstra.xml FULL_LINK --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/) +ADD_TEST(memcheck-tesh-simdag-parser-sym-full-4 ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test Dijkstra.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/) ADD_TEST(memcheck-tesh-simdag-flatifier-0 ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/flatifier one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/) ADD_TEST(memcheck-tesh-simdag-flatifier-1 ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/flatifier one_host_availability.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/) ADD_TEST(memcheck-tesh-simdag-flatifier-2 ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/flatifier one_host_properties.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/) @@ -359,12 +359,12 @@ ADD_TEST(memcheck-gras-synchro-sg-64-raw-0 ${CMAKE_BINARY_DIR}/examples/gras/syn endif(HAVE_RAWCTX) ENDIF(${ARCH_32_BITS}) -ADD_TEST(memcheck-gras-properties-sg-thread-0 ${CMAKE_BINARY_DIR}/examples/gras/properties/properties_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/../../platforms/prop.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/properties.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n --cfg=contexts/factory:thread --cd ${CMAKE_BINARY_DIR}/examples/gras/properties/) +ADD_TEST(memcheck-gras-properties-sg-thread-0 ${CMAKE_BINARY_DIR}/examples/gras/properties/properties_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/../../platforms/prop.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/properties.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread --cd ${CMAKE_BINARY_DIR}/examples/gras/properties/) if(HAVE_UCONTEXT_H) -ADD_TEST(memcheck-gras-properties-sg-ucontext-0 ${CMAKE_BINARY_DIR}/examples/gras/properties/properties_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/../../platforms/prop.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/properties.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n --cfg=contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/examples/gras/properties/) +ADD_TEST(memcheck-gras-properties-sg-ucontext-0 ${CMAKE_BINARY_DIR}/examples/gras/properties/properties_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/../../platforms/prop.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/properties.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/examples/gras/properties/) endif(HAVE_UCONTEXT_H) if(HAVE_RAWCTX) -ADD_TEST(memcheck-gras-properties-sg-raw-0 ${CMAKE_BINARY_DIR}/examples/gras/properties/properties_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/../../platforms/prop.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/properties.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n --cfg=contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/examples/gras/properties/) +ADD_TEST(memcheck-gras-properties-sg-raw-0 ${CMAKE_BINARY_DIR}/examples/gras/properties/properties_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/../../platforms/prop.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/properties.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/examples/gras/properties/) endif(HAVE_RAWCTX) # amok examples diff --git a/examples/gras/properties/test_sg.tesh b/examples/gras/properties/test_sg.tesh index ebf5a1adfe..c0790dc68f 100644 --- a/examples/gras/properties/test_sg.tesh +++ b/examples/gras/properties/test_sg.tesh @@ -1,7 +1,7 @@ p Runs the 'properties' test within the simulator (simulation times valid for 32bits architectures) ! output sort -$ $SG_TEST_EXENV ./properties_simulator${EXEEXT:=} ${srcdir:=.}/../../platforms/prop.xml ${srcdir:=.}/properties.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ./properties_simulator${EXEEXT:=} ${srcdir:=.}/../../platforms/prop.xml ${srcdir:=.}/properties.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (2:bob@host1) == Dump all the properties of host1 > [ 0.000000] (2:bob@host1) Host property: 'SG_TEST_Hdd' has value: '180' > [ 0.000000] (2:bob@host1) Host property: 'SG_TEST_mem' has value: '4' diff --git a/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh b/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh index e52e9ad88d..fb3eb29332 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh @@ -313,7 +313,7 @@ $ ${bindir:=.}/basic_parsing_test two_hosts_one_link_fullduplex.xml FULL_LINK "- > Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 > Route latency = 0.000015, route bandwidth = 498000000.000000 -$ ${bindir:=.}/basic_parsing_test Dijkstra.xml FULL_LINK --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test Dijkstra.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 2, link number: 6 > Route between NODO01 and NODO01