From dcdb874a33c9e23f0b61294874bde89f7aa7c899 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 24 Jul 2015 20:36:51 +0200 Subject: [PATCH] fix a tesh because of the recent file moving around storage --- buildtools/Cmake/DefinePackages.cmake | 6 +++--- examples/platforms/{ => storage}/content/small_content.txt | 0 .../platforms/{ => storage}/content/storage_content.txt | 0 .../platforms/{ => storage}/content/win_storage_content.txt | 0 teshsuite/msg/storage/storage_basic.tesh | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename examples/platforms/{ => storage}/content/small_content.txt (100%) rename examples/platforms/{ => storage}/content/storage_content.txt (100%) rename examples/platforms/{ => storage}/content/win_storage_content.txt (100%) diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 76a12acc60..4880298460 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -1260,9 +1260,6 @@ set(PLATFORMS_EXAMPLES examples/platforms/conf/transform_optorsim_platform.pl examples/platforms/config.xml examples/platforms/config_tracing.xml - examples/platforms/content/small_content.txt - examples/platforms/content/storage_content.txt - examples/platforms/content/win_storage_content.txt examples/platforms/trace/trace_A_failure.txt examples/platforms/trace/trace_A.txt examples/platforms/trace/trace_B.txt @@ -1280,6 +1277,9 @@ set(PLATFORMS_EXAMPLES examples/platforms/platform.xml examples/platforms/prop.xml examples/platforms/routing_cluster.xml + examples/platforms/storage/content/small_content.txt + examples/platforms/storage/content/storage_content.txt + examples/platforms/storage/content/win_storage_content.txt examples/platforms/storage/remote_io.deployment.xml examples/platforms/storage/remote_io.xml examples/platforms/storage/storage.xml diff --git a/examples/platforms/content/small_content.txt b/examples/platforms/storage/content/small_content.txt similarity index 100% rename from examples/platforms/content/small_content.txt rename to examples/platforms/storage/content/small_content.txt diff --git a/examples/platforms/content/storage_content.txt b/examples/platforms/storage/content/storage_content.txt similarity index 100% rename from examples/platforms/content/storage_content.txt rename to examples/platforms/storage/content/storage_content.txt diff --git a/examples/platforms/content/win_storage_content.txt b/examples/platforms/storage/content/win_storage_content.txt similarity index 100% rename from examples/platforms/content/win_storage_content.txt rename to examples/platforms/storage/content/win_storage_content.txt diff --git a/teshsuite/msg/storage/storage_basic.tesh b/teshsuite/msg/storage/storage_basic.tesh index 111fd23af5..9f626c6175 100644 --- a/teshsuite/msg/storage/storage_basic.tesh +++ b/teshsuite/msg/storage/storage_basic.tesh @@ -1,4 +1,4 @@ -$ ./storage_basic$EXEEXT --cfg=path:${srcdir:=.} ${srcdir:=.}/../../../examples/platforms/storage.xml ${srcdir:=.}/deployment.xml 0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ./storage_basic$EXEEXT --cfg=path:${srcdir:=.} ${srcdir:=.}/../../../examples/platforms/storage/storage.xml ${srcdir:=.}/deployment.xml 0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) The custom configuration 'path' is already defined by user! > [ 0.000000] (1:server@alice) *** Storage info on alice *** > [ 0.000000] (1:server@alice) Storage name: Disk2, mount name: c: -- 2.20.1