Storage-kill: this test is useless now

diff --git a/teshsuite/simdag/CMakeLists.txt b/teshsuite/simdag/CMakeLists.txt
index 199d83f..75959d5 100644 (file)
--- a/teshsuite/simdag/CMakeLists.txt
+++ b/teshsuite/simdag/CMakeLists.txt
@@ -24,7 +24,6 @@ endforeach()
 set(teshsuite_src ${teshsuite_src}  PARENT_SCOPE)
 set(tesh_files    ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/flatifier/bogus_two_hosts_asymetric.tesh
                                     ${CMAKE_CURRENT_SOURCE_DIR}/flatifier/bogus_missing_gateway.tesh
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/flatifier/bogus_disk_attachment.tesh
                                     ${CMAKE_CURRENT_SOURCE_DIR}/basic-parsing-test/basic-parsing-test-sym-full.tesh
                                     ${CMAKE_CURRENT_SOURCE_DIR}/basic-parsing-test/basic-parsing-test-bypass.tesh
                                     PARENT_SCOPE)
@@ -85,12 +84,10 @@ if(enable_debug)
   # these tests need assertions
   ADD_TESH(tesh-parser-bogus-symmetric         --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/flatifier --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/flatifier ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh)
   ADD_TESH(tesh-parser-bogus-missing-gw        --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/flatifier --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/flatifier ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh)
-  ADD_TESH(tesh-parser-bogus-disk-attachment   --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/flatifier --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/flatifier ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/flatifier/bogus_disk_attachment.tesh)
 
    #These tests fail on Windows as the signal returned is not the same as Unix would send.
   if(WIN32)
     set_property(TEST tesh-parser-bogus-symmetric PROPERTY WILL_FAIL TRUE)
     set_property(TEST tesh-parser-bogus-missing-gw PROPERTY WILL_FAIL TRUE)
-    set_property(TEST tesh-parser-bogus-disk-attachment PROPERTY WILL_FAIL TRUE)
   endif()
 endif()

diff --git a/teshsuite/simdag/flatifier/bogus_disk_attachment.tesh b/teshsuite/simdag/flatifier/bogus_disk_attachment.tesh
deleted file mode 100644 (file)
index ee01d40..0000000
--- a/teshsuite/simdag/flatifier/bogus_disk_attachment.tesh
+++ /dev/null
@@ -1,5 +0,0 @@
-! expect signal SIGABRT
-$ $VALGRIND_NO_LEAK_CHECK ${bindir:=.}/flatifier ../platforms/bogus_disk_attachment.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n"
-> [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
-> [  0.000000] [0:maestro@] Parse error at ../platforms/bogus_disk_attachment.xml:19: Unable to attach storage cdisk: host plouf does not exist.
-> [  0.000000] [0:maestro@] Exiting now.

diff --git a/teshsuite/simdag/platforms/bogus_disk_attachment.xml b/teshsuite/simdag/platforms/bogus_disk_attachment.xml
deleted file mode 100644 (file)
index e61b30b..0000000
--- a/teshsuite/simdag/platforms/bogus_disk_attachment.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
-<platform version="4.1">
-  <!-- THIS FILE IS INVALID.
-       It declares a storage attached to a nonexistent host (plouf). See bogus_disk_attachment.tesh -->
-  <zone id="AS0" routing="Full">
-    <storage_type id="single_HDD" model="SSD" size="4kB">
-      <model_prop id="Bwrite" value="30MBps" />
-      <model_prop id="Bread" value="100MBps" />
-      <model_prop id="Bconnection" value="150MBps" />
-    </storage_type>
-
-    <storage id="cdisk" typeId="single_HDD"  attach="plouf" />
-
-    <host id="client" speed="1Gf">
-      <mount storageId="cdisk" name="/sd1" />
-    </host>
-  </zone>
-</platform>