add a new test for storage access in Java

diff --git a/examples/java/io/storage.tesh b/examples/java/io/storage.tesh
new file mode 100644 (file)
index 0000000..f8d9db4
--- /dev/null
+++ b/examples/java/io/storage.tesh
@@ -0,0 +1,46 @@
+#! tesh
+
+$ java -classpath ${classpath:=.} io/Storage ${srcdir:=.}/../platforms/storage/storage.xml
+> [0.000000] [jmsg/INFO] Using regular java threads.
+> [denise:0:(1) 0.000000] [jmsg/INFO] ------------------------------------
+> [denise:0:(1) 0.000000] [jmsg/INFO] Disk name: Disk2
+> [denise:0:(1) 0.000000] [jmsg/INFO] Size: 536870912000 bytes.
+> [denise:0:(1) 0.000000] [jmsg/INFO] Free Size: 534479374867 bytes.
+> [denise:0:(1) 0.000000] [jmsg/INFO] Used Size: 2391537133 bytes.
+> [denise:0:(1) 0.000000] [jmsg/INFO] ------------------------------------
+> [denise:0:(1) 0.000000] [jmsg/INFO] Disk name: Disk4
+> [denise:0:(1) 0.000000] [jmsg/INFO] Size: 536870912000 bytes.
+> [denise:0:(1) 0.000000] [jmsg/INFO] Free Size: 536857690006 bytes.
+> [denise:0:(1) 0.000000] [jmsg/INFO] Used Size: 13221994 bytes.
+> [denise:0:(1) 0.000000] [jmsg/INFO] Disk name: Disk2
+> [denise:0:(1) 0.000000] [jmsg/INFO] Attached to host:alice
+> [denise:0:(1) 0.000000] [jmsg/INFO] Property key: Pierre
+> [denise:0:(1) 0.000000] [jmsg/INFO] Property key2: Pierre
+> [denise:0:(1) 0.000000] [jmsg/INFO] Disk attached: Disk4
+> [denise:0:(1) 0.000000] [jmsg/INFO] **************** ALL *************************
+> [denise:0:(1) 0.000000] [jmsg/INFO] Disk: Disk1
+> [denise:0:(1) 0.000000] [jmsg/INFO] Disk: Disk2
+> [denise:0:(1) 0.000000] [jmsg/INFO] Disk: Disk3
+> [denise:0:(1) 0.000000] [jmsg/INFO] Disk: Disk4
+> [0.000000] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...
+
+$ java -classpath ${classpath:=.} io/IO ${srcdir:=.}/../platforms/storage/storage.xml
+> [0.000000] [jmsg/INFO] Using regular java threads.
+> [0.000000] [jmsg/INFO] Number of hosts:4
+> [denise:0:(1) 0.000000] [jmsg/INFO] Open file /home/doc/simgrid/examples/platforms/g5k.xml
+> [alice:1:(2) 0.000000] [jmsg/INFO] Open file c:\Windows\setupact.log
+> [carl:2:(3) 0.000000] [jmsg/INFO] Open file /home/doc/simgrid/examples/platforms/g5k_cabinets.xml
+> [bob:3:(4) 0.000000] [jmsg/INFO] Open file /home/doc/simgrid/examples/platforms/nancy.xml
+> [bob:3:(4) 0.000040] [jmsg/INFO] Having read 4028 on /home/doc/simgrid/examples/platforms/nancy.xml
+> [bob:3:(4) 0.000040] [jmsg/INFO] Having write 0 on /home/doc/simgrid/examples/platforms/nancy.xml
+> [bob:3:(4) 0.000040] [jmsg/INFO] Having read 0 on /home/doc/simgrid/examples/platforms/nancy.xml
+> [denise:0:(1) 0.000085] [jmsg/INFO] Having read 17028 on /home/doc/simgrid/examples/platforms/g5k.xml
+> [denise:0:(1) 0.000085] [jmsg/INFO] Having write 0 on /home/doc/simgrid/examples/platforms/g5k.xml
+> [denise:0:(1) 0.000085] [jmsg/INFO] Having read 0 on /home/doc/simgrid/examples/platforms/g5k.xml
+> [carl:2:(3) 0.000226] [jmsg/INFO] Having read 22645 on /home/doc/simgrid/examples/platforms/g5k_cabinets.xml
+> [carl:2:(3) 0.000226] [jmsg/INFO] Having write 0 on /home/doc/simgrid/examples/platforms/g5k_cabinets.xml
+> [carl:2:(3) 0.000226] [jmsg/INFO] Having read 0 on /home/doc/simgrid/examples/platforms/g5k_cabinets.xml
+> [alice:1:(2) 0.000508] [jmsg/INFO] Having read 101663 on c:\Windows\setupact.log
+> [alice:1:(2) 0.000508] [jmsg/INFO] Having write 0 on c:\Windows\setupact.log
+> [alice:1:(2) 0.000508] [jmsg/INFO] Having read 0 on c:\Windows\setupact.log
+> [0.000508] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index 7d582cd..d3d6c0a 100644 (file)
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -505,6 +505,7 @@ IF(NOT enable_memcheck)
     ADD_TESH(java-cloud-migration                --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/cloud/migration/migration.tesh)
     ADD_TESH(java-commTime                       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/commTime/commtime.tesh)
     ADD_TESH(java-energy                         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/energy/energy.tesh)
+    ADD_TESH(java-storage                        --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/io/storage.tesh)
     ADD_TESH(java-kademlia                       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/kademlia/kademlia.tesh)
     ADD_TESH(java-kill                           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/master_slave_kill/kill.tesh)
     ADD_TESH(java-masterslave                    --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/masterslave/masterslave.tesh)