From: Martin Quinson Date: Fri, 28 Feb 2014 10:41:14 +0000 (+0100) Subject: Rename a test to clearly show that it should properly detect bogus input files X-Git-Tag: v3_11~246 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/67c5bbaeea1063bb13bab47095e6f6c62f772dd4?hp=be088cd19b02f621c210cdfc937a16dcd4f571b4 Rename a test to clearly show that it should properly detect bogus input files --- diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index 9d5814c4e3..7d7336b00f 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -113,7 +113,7 @@ if(NOT enable_memcheck) # these tests need the assertion mechanism # exclude them from memcheck, as they normally die, leaving lots of unfree'd objects IF(enable_debug AND NOT enable_memcheck) - ADD_TEST(tesh-simdag-parser-bogus-symmetric ${TESH_COMMAND} ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms two_hosts_asymetric.tesh) + ADD_TEST(tesh-parser-bogus-symmetric ${TESH_COMMAND} ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms bogus_two_hosts_asymetric.tesh) ENDIF() ADD_TEST(tesh-simdag-bypass ${TESH_COMMAND} ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_bypass.tesh) diff --git a/teshsuite/simdag/platforms/two_hosts_asymetric_BOGUS2.xml b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric-2.xml similarity index 100% rename from teshsuite/simdag/platforms/two_hosts_asymetric_BOGUS2.xml rename to teshsuite/simdag/platforms/bogus_two_hosts_asymetric-2.xml diff --git a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.tesh b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.tesh new file mode 100644 index 0000000000..a18c41736a --- /dev/null +++ b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.tesh @@ -0,0 +1,9 @@ +! expect signal SIGABRT +$ ${bindir:=.}/flatifier bogus_two_hosts_asymetric.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 +> [ 0.000000] [0:@] Parse error at bogus_two_hosts_asymetric.xml:24: A route between "alice" and "bob" already exists with a different content. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags. + +! expect signal SIGABRT +$ ${bindir:=.}/flatifier bogus_two_hosts_asymetric-2.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 +> [ 0.000000] [0:@] Parse error at bogus_two_hosts_asymetric-2.xml:26: A route between "alice" and "bob" already exists with a different content. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags. diff --git a/teshsuite/simdag/platforms/two_hosts_asymetric_BOGUS.xml b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml similarity index 100% rename from teshsuite/simdag/platforms/two_hosts_asymetric_BOGUS.xml rename to teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml diff --git a/teshsuite/simdag/platforms/two_hosts_asymetric.tesh b/teshsuite/simdag/platforms/two_hosts_asymetric.tesh deleted file mode 100644 index 84cc3900db..0000000000 --- a/teshsuite/simdag/platforms/two_hosts_asymetric.tesh +++ /dev/null @@ -1,9 +0,0 @@ -! expect signal SIGABRT -$ ${bindir:=.}/flatifier two_hosts_asymetric_BOGUS.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 -> [ 0.000000] [0:@] Parse error at two_hosts_asymetric_BOGUS.xml:24: A route between "alice" and "bob" already exists with a different content. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags. - -! expect signal SIGABRT -$ ${bindir:=.}/flatifier two_hosts_asymetric_BOGUS2.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" -> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 -> [ 0.000000] [0:@] Parse error at two_hosts_asymetric_BOGUS2.xml:26: A route between "alice" and "bob" already exists with a different content. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags.