From 521aeea18c7e268ab03acaaca0ee13756796990f Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Fri, 25 Sep 2015 16:15:00 +0200 Subject: [PATCH] tesh revalidation to account for file descriptor id display. --- examples/msg/io/io.tesh | 1 + examples/msg/io/remote.tesh | 4 ++++ examples/msg/io/storage.tesh | 2 ++ 3 files changed, 7 insertions(+) diff --git a/examples/msg/io/io.tesh b/examples/msg/io/io.tesh index 01b3c6a289..cfe5ef3cb9 100644 --- a/examples/msg/io/io.tesh +++ b/examples/msg/io/io.tesh @@ -12,6 +12,7 @@ $ ${bindir:=.}/io/file ${srcdir:=.}/examples/platforms/storage/storage.xml "--lo > Storage Id: 'Disk4' > Storage Type: 'single_SSD' > Content Type: 'txt_unix' +> File Descriptor Id: 0 > [ 0.000000] (1:0@denise) Open file '/home/doc/simgrid/examples/platforms/g5k.xml' > [ 0.000000] (2:1@alice) Capacity of the storage element 'c:\Windows\setupact.log' is stored on: 2391537133 / 536870912000 > [ 0.000000] (3:2@carl) Capacity of the storage element '/home/doc/simgrid/examples/platforms/g5k_cabinets.xml' is stored on: 36946053 / 536870912000 diff --git a/examples/msg/io/remote.tesh b/examples/msg/io/remote.tesh index e3ca838fc8..f07cafd1a1 100644 --- a/examples/msg/io/remote.tesh +++ b/examples/msg/io/remote.tesh @@ -14,6 +14,7 @@ $ ${bindir:=.}/io/remote$EXEEXT ${srcdir:=.}/examples/platforms/storage/remote_i > Storage Id: 'Disk2' > Storage Type: 'SATA-II_HDD' > Content Type: 'txt_windows' +> File Descriptor Id: 0 > [ 0.000000] (2@ bob) File Descriptor information: > Full path: '/scratch/lib/libsimgrid.so.3.6.2' > Size: 12710497 @@ -21,6 +22,7 @@ $ ${bindir:=.}/io/remote$EXEEXT ${srcdir:=.}/examples/platforms/storage/remote_i > Storage Id: 'Disk1' > Storage Type: 'SATA-II_HDD' > Content Type: 'txt_unix' +> File Descriptor Id: 0 > [ 0.000000] (3@ carl) File Descriptor information: > Full path: '/scratch/lib/libsimgrid.so.3.6.2' > Size: 12710497 @@ -28,6 +30,7 @@ $ ${bindir:=.}/io/remote$EXEEXT ${srcdir:=.}/examples/platforms/storage/remote_i > Storage Id: 'Disk1' > Storage Type: 'SATA-II_HDD' > Content Type: 'txt_unix' +> File Descriptor Id: 0 > [ 0.000000] (4@ dave) File Descriptor information: > Full path: 'c:\Windows\bootstat.dat' > Size: 67584 @@ -35,6 +38,7 @@ $ ${bindir:=.}/io/remote$EXEEXT ${srcdir:=.}/examples/platforms/storage/remote_i > Storage Id: 'Disk2' > Storage Type: 'SATA-II_HDD' > Content Type: 'txt_windows' +> File Descriptor Id: 0 > [ 0.000000] (1@alice) Try to read 101663 from 'c:\Windows\setupact.log' > [ 0.000000] (2@ bob) Try to read 12710497 from '/scratch/lib/libsimgrid.so.3.6.2' > [ 0.000000] (3@ carl) Try to read 12710497 from '/scratch/lib/libsimgrid.so.3.6.2' diff --git a/examples/msg/io/storage.tesh b/examples/msg/io/storage.tesh index 00412a4092..662489eec7 100644 --- a/examples/msg/io/storage.tesh +++ b/examples/msg/io/storage.tesh @@ -18,6 +18,7 @@ $ ${bindir:=.}/io/storage$EXEEXT ${srcdir:=.}/examples/platforms/storage/storage > Storage Id: 'Disk4' > Storage Type: 'single_SSD' > Content Type: 'txt_unix' +> File Descriptor Id: 0 > [ 0.003333] (1:(null)@denise) Free size: 536857490006 bytes > [ 0.003333] (1:(null)@denise) Used size: 13421994 bytes > [ 0.004333] (1:(null)@denise) Read 200000 bytes on /home/tmp/data.txt @@ -29,6 +30,7 @@ $ ${bindir:=.}/io/storage$EXEEXT ${srcdir:=.}/examples/platforms/storage/storage > Storage Id: 'Disk4' > Storage Type: 'single_SSD' > Content Type: 'txt_unix' +> File Descriptor Id: 0 > [ 0.006000] (1:(null)@denise) *** Move '/tmp/data.txt' into '/tmp/simgrid.readme' > [ 0.006000] (1:(null)@denise) User data attached to the file: 777 > [ 0.006000] (1:(null)@denise) *** Get/set data for storage element: Disk4 *** -- 2.20.1