remove some redundant files

diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt
index 34ec88c..cb70819 100644 (file)
--- a/teshsuite/simdag/platforms/CMakeLists.txt
+++ b/teshsuite/simdag/platforms/CMakeLists.txt
@@ -56,7 +56,6 @@ set(xml_files
   ${CMAKE_CURRENT_SOURCE_DIR}/bogus_missing_src_gateway.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/bogus_missing_dst_gateway.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/bogus_two_hosts_asymetric.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/bogus_two_hosts_asymetric-2.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_one_link_fullduplex.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_one_link_symmetrical.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_one_link.xml
@@ -76,10 +75,6 @@ set(teshsuite_src
   PARENT_SCOPE)
 set(txt_files
   ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/bob0_availability_file.trace
-  ${CMAKE_CURRENT_SOURCE_DIR}/bob0_state_file.trace
-  ${CMAKE_CURRENT_SOURCE_DIR}/bob2_availability_file.trace
-  ${CMAKE_CURRENT_SOURCE_DIR}/bob2_state_file.trace
   ${CMAKE_CURRENT_SOURCE_DIR}/bob.fail
   ${CMAKE_CURRENT_SOURCE_DIR}/bob.trace
   ${CMAKE_CURRENT_SOURCE_DIR}/link1.bw

diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh
index 76cc76f..20c33d7 100644 (file)
--- a/teshsuite/simdag/platforms/basic_parsing_test.tesh
+++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh
@@ -79,9 +79,14 @@ $ ${bindir:=.}/basic_parsing_test ./properties.xml --cfg=cpu/optim:TI
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'Vegas'
 > Workstation number: 1, link number: 1
 
+$ cp -f ./bob.trace ./bob0_availability_file.trace
+$ cp -f ./bob.trace ./bob2_availability_file.trace
+$ cp -f ./bob.trace ./bob0_state_file.trace
+$ cp -f ./bob.trace ./bob2_state_file.trace
 $ ${bindir:=.}/basic_parsing_test ./one_cluster_file.xml
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > Workstation number: 2, link number: 6
+$ rm -f ./bob0_availability_file.trace ./bob2_availability_file.trace ./bob0_state_file.trace ./bob2_state_file.trace
 
 $ ${bindir:=.}/is_router_test ./test_of_is_router.xml
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.

diff --git a/teshsuite/simdag/platforms/bob0_availability_file.trace b/teshsuite/simdag/platforms/bob0_availability_file.trace
deleted file mode 100644 (file)
index 019c2c8..0000000
--- a/teshsuite/simdag/platforms/bob0_availability_file.trace
+++ /dev/null
@@ -1,4 +0,0 @@
-PERIODICITY 1.0
-0.0 1.0
-11.0 0.5
-20.0 0.8

diff --git a/teshsuite/simdag/platforms/bob0_state_file.trace b/teshsuite/simdag/platforms/bob0_state_file.trace
deleted file mode 100644 (file)
index 019c2c8..0000000
--- a/teshsuite/simdag/platforms/bob0_state_file.trace
+++ /dev/null
@@ -1,4 +0,0 @@
-PERIODICITY 1.0
-0.0 1.0
-11.0 0.5
-20.0 0.8

diff --git a/teshsuite/simdag/platforms/bob2_availability_file.trace b/teshsuite/simdag/platforms/bob2_availability_file.trace
deleted file mode 100644 (file)
index 019c2c8..0000000
--- a/teshsuite/simdag/platforms/bob2_availability_file.trace
+++ /dev/null
@@ -1,4 +0,0 @@
-PERIODICITY 1.0
-0.0 1.0
-11.0 0.5
-20.0 0.8

diff --git a/teshsuite/simdag/platforms/bob2_state_file.trace b/teshsuite/simdag/platforms/bob2_state_file.trace
deleted file mode 100644 (file)
index 019c2c8..0000000
--- a/teshsuite/simdag/platforms/bob2_state_file.trace
+++ /dev/null
@@ -1,4 +0,0 @@
-PERIODICITY 1.0
-0.0 1.0
-11.0 0.5
-20.0 0.8

diff --git a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric-2.xml b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric-2.xml
deleted file mode 100644 (file)
index 10c9d3b..0000000
--- a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric-2.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- THIS FILE IS INVALID.
-
-It declares a route alice->bob and another bob->alice, both being different.
-It is used to check that this (bogus) file is detected as is (see two_hosts_asymetric.tesh) -->
-
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
- <AS  id="AS0"  routing="Full">
-    <host id="bob" speed="1Gf"/>
-    <host id="alice" speed="500Mf"/>
-
-    <link id="link1" bandwidth="125MBps" latency="50us"/>
-    <link id="link2" bandwidth="125MBps" latency="50us"/>
-    <link id="link3" bandwidth="125MBps" latency="50us"/>
-    <link id="link4" bandwidth="125MBps" latency="50us"/>
-
-   <route src="bob"   dst="alice"><link_ctn id="link1"/><link_ctn id="link2"/><link_ctn id="link4"/></route>
-   <route src="alice" dst="bob">  <link_ctn id="link4"/><link_ctn id="link3"/><link_ctn id="link1"/></route>
-  </AS>
-</platform>

diff --git a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.tesh b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.tesh
index efcf85d..e3381ed 100644 (file)
--- a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.tesh
+++ b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.tesh
@@ -2,8 +2,3 @@
 $ ${bindir:=.}/flatifier bogus_two_hosts_asymetric.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
 > [  0.000000] [0:maestro@] Error while loading bogus_two_hosts_asymetric.xml: The route between alice and bob already exists (Rq: routes are symmetrical by default).
-
-! 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:maestro@] Switching to the L07 model to handle parallel tasks.
-> [  0.000000] [0:maestro@] Error while loading bogus_two_hosts_asymetric-2.xml: The route between alice and bob already exists (Rq: routes are symmetrical by default).