Cleaned up test.

Updated scn files to match present expected test output.

1 files changed, 168 insertions, 168 deletions

diff --git a/testsuites/psxtests/psxfile01/psxfile01.scn b/testsuites/psxtests/psxfile01/psxfile01.scn
index e105dafb89..bc051aae14 100644
--- a/testsuites/psxtests/psxfile01/psxfile01.scn
+++ b/testsuites/psxtests/psxfile01/psxfile01.scn
@@ -1,168 +1,168 @@
-

-

-*** FILE TEST 1 ***

-*************** Dump of Entire IMFS ***************

-/

-    dev/

-        console (device 0, 0)

-***************       End of Dump        ***************

-stat of /dev/console

-    st_dev     (0x0:0x0)

-    st_ino     3

-    mode  = 00020771

-    nlink = 1

-    uid = 0

-    gid = 0

-    atime = Fri Jan 01 00:00:00 1988

-    mtime = Fri Jan 01 00:00:00 1988

-    ctime = Fri Jan 01 00:00:00 1988

-

-mkdir /dev/tty

-

-mkdir /usr

-mkdir /etc

-mkdir /tmp

-mkdir /tmp/..

-mkdir /tmp/

-mkdir /j/j1

-mkdir tmp

-

-rmdir /usr

-mkdir /etc/passwd/j

-open /tmp/joel - should fail with ENOENT

-open /tmp/j

-open returned file descriptor 3

-close /tmp/j

-unlink /tmp/j

-(0)the first write!!!

-

-(10)the first write!!!

-

-stat( /tmp/joel ) returned     st_dev     (0x1a7f8:0x3e86f0)

-    st_ino     d

-    mode  = 00100700

-    nlink = 1

-    uid = 0

-    gid = 0

-    atime = Sat Dec 31 09:00:00 1988

-    mtime = Sat Dec 31 09:00:00 1988

-    ctime = Sat Dec 31 09:00:00 1988

-(514)the first write!!!

-

-(513)the first write!!!

-

-(24)the first write!!!

-

-(2)the first write!!!

-

-(1)the first write!!!

-

-(0)the first write!!!

-

-(0)rst write!!!

-

-(513)the first write!!!

-

-(139743)

-stat( /tmp/joel ) returned     st_dev     (0x1a7f8:0x3e86f0)

-    st_ino     e

-    mode  = 00100700

-    nlink = 1

-    uid = 0

-    gid = 0

-    atime = Sat Dec 31 09:00:00 1988

-    mtime = Sat Dec 31 09:00:00 1988

-    ctime = Sat Dec 31 09:00:00 1988

-stat of /tmp/j

-stat(/tmp/j) returned -1 (errno=2)

-    st_dev     (0x0:0x0)

-    st_ino     3

-    mode  = 00020771

-    nlink = 1

-    uid = 0

-    gid = 0

-    atime = Fri Jan 01 00:00:00 1988

-    mtime = Fri Jan 01 00:00:00 1988

-    ctime = Fri Jan 01 00:00:00 1988

-fopen of /tmp/j

-fprintf to /tmp/j

-(1) 26 characters written to the file

-(2) 26 characters written to the file

-(3) 26 characters written to the file

-(4) 26 characters written to the file

-(5) 26 characters written to the file

-    st_dev     (0x0:0x0)

-    st_ino     f

-    mode  = 00100660

-    nlink = 1

-    uid = 0

-    gid = 0

-    atime = Sat Dec 31 09:00:00 1988

-    mtime = Sat Dec 31 09:00:00 1988

-    ctime = Sat Dec 31 09:00:00 1988

-This is call 1 to fprintf

-This is call 2 to fprintf

-This is call 3 to fprintf

-This is call 4 to fprintf

-This is call 5 to fprintf

-    st_dev     (0x0:0x0)

-    st_ino     f

-    mode  = 00100660

-    nlink = 1

-    uid = 0

-    gid = 0

-    atime = Sat Dec 31 09:00:01 1988

-    mtime = Sat Dec 31 09:00:00 1988

-    ctime = Sat Dec 31 09:00:00 1988

-*************** Dump of Entire IMFS ***************

-/

-    dev/

-        console (device 0, 0)

-        tty/

-            S3 (device 255, 128)

-        test_console (device 0, 0)

-    etc/

-        passwd (file 0 0x0 0x0 0x0)

-    tmp/

-        joel (file 279487 0x3d5ac0 0x3d5570 0x3d5020)

-        j (file 130 0x37f530 0x0 0x0)

-***************       End of Dump        ***************

-truncate /tmp/j to length of 40

-    st_dev     (0x0:0x0)

-    st_ino     f

-    mode  = 00100660

-    nlink = 1

-    uid = 0

-    gid = 0

-    atime = Sat Dec 31 09:00:02 1988

-    mtime = Sat Dec 31 09:00:00 1988

-    ctime = Sat Dec 31 09:00:00 1988

-*************** Dump of Entire IMFS ***************

-/

-    dev/

-        console (device 0, 0)

-        tty/

-            S3 (device 255, 128)

-        test_console (device 0, 0)

-    etc/

-        passwd (file 0 0x0 0x0 0x0)

-    tmp/

-        j (file 40 0x37f530 0x0 0x0)

-***************       End of Dump        ***************

-truncate /tmp/j to length of 0

-truncate /tmp to length of 0 should fail with EISDIR

-

-21: Is a directory

-*************** Dump of Entire IMFS ***************

-/

-    dev/

-        console (device 0, 0)

-        tty/

-            S3 (device 255, 128)

-        test_console (device 0, 0)

-    etc/

-        passwd (file 0 0x0 0x0 0x0)

-    tmp/

-        j (file 0 0x37f530 0x0 0x0)

-***************       End of Dump        ***************

-*** END OF FILE TEST 1 ***

+
+
+*** FILE TEST 1 ***
+*************** Dump of Entire IMFS ***************
+/
+    dev/
+        console (device 0, 0)
+***************       End of Dump        ***************
+stat of /dev/console
+    st_dev     (0x0:0x0)
+    st_ino     3
+    mode  = 00020771
+    nlink = 1
+    uid = 0
+    gid = 0
+    atime = Fri Jan 01 00:00:00 1988
+    mtime = Fri Jan 01 00:00:00 1988
+    ctime = Fri Jan 01 00:00:00 1988
+
+mkdir /dev/tty
+
+mkdir /usr
+mkdir /etc
+mkdir /tmp
+mkdir /tmp/..
+mkdir /tmp/
+mkdir /j/j1
+mkdir tmp
+
+rmdir /usr
+mkdir /etc/passwd/j
+open /tmp/joel - should fail with ENOENT
+open /tmp/j
+open returned file descriptor 3
+close /tmp/j
+unlink /tmp/j
+(0)the first write!!!
+
+(10)the first write!!!
+
+stat( /tmp/joel ) returned     st_dev     (0x1a7f8:0x3e86f0)
+    st_ino     d
+    mode  = 00100700
+    nlink = 1
+    uid = 0
+    gid = 0
+    atime = Sat Dec 31 09:00:00 1988
+    mtime = Sat Dec 31 09:00:00 1988
+    ctime = Sat Dec 31 09:00:00 1988
+(514)the first write!!!
+
+(513)the first write!!!
+
+(24)the first write!!!
+
+(2)the first write!!!
+
+(1)the first write!!!
+
+(0)the first write!!!
+
+(0)rst write!!!
+
+(513)the first write!!!
+
+(139743)
+stat( /tmp/joel ) returned     st_dev     (0x1a7f8:0x3e86f0)
+    st_ino     e
+    mode  = 00100700
+    nlink = 1
+    uid = 0
+    gid = 0
+    atime = Sat Dec 31 09:00:00 1988
+    mtime = Sat Dec 31 09:00:00 1988
+    ctime = Sat Dec 31 09:00:00 1988
+stat of /tmp/j
+stat(/tmp/j) returned -1 (errno=2)
+    st_dev     (0x0:0x0)
+    st_ino     3
+    mode  = 00020771
+    nlink = 1
+    uid = 0
+    gid = 0
+    atime = Fri Jan 01 00:00:00 1988
+    mtime = Fri Jan 01 00:00:00 1988
+    ctime = Fri Jan 01 00:00:00 1988
+fopen of /tmp/j
+fprintf to /tmp/j
+(1) 26 characters written to the file
+(2) 26 characters written to the file
+(3) 26 characters written to the file
+(4) 26 characters written to the file
+(5) 26 characters written to the file
+    st_dev     (0x0:0x0)
+    st_ino     f
+    mode  = 00100660
+    nlink = 1
+    uid = 0
+    gid = 0
+    atime = Sat Dec 31 09:00:00 1988
+    mtime = Sat Dec 31 09:00:00 1988
+    ctime = Sat Dec 31 09:00:00 1988
+This is call 1 to fprintf
+This is call 2 to fprintf
+This is call 3 to fprintf
+This is call 4 to fprintf
+This is call 5 to fprintf
+    st_dev     (0x0:0x0)
+    st_ino     f
+    mode  = 00100660
+    nlink = 1
+    uid = 0
+    gid = 0
+    atime = Sat Dec 31 09:00:01 1988
+    mtime = Sat Dec 31 09:00:00 1988
+    ctime = Sat Dec 31 09:00:00 1988
+*************** Dump of Entire IMFS ***************
+/
+    dev/
+        console (device 0, 0)
+        tty/
+            S3 (device 255, 128)
+        test_console (device 0, 0)
+    etc/
+        passwd (file 0 0x0 0x0 0x0)
+    tmp/
+        joel (file 279487 0x3d5ac0 0x3d5570 0x3d5020)
+        j (file 130 0x37f530 0x0 0x0)
+***************       End of Dump        ***************
+truncate /tmp/j to length of 40
+    st_dev     (0x0:0x0)
+    st_ino     f
+    mode  = 00100660
+    nlink = 1
+    uid = 0
+    gid = 0
+    atime = Sat Dec 31 09:00:02 1988
+    mtime = Sat Dec 31 09:00:00 1988
+    ctime = Sat Dec 31 09:00:00 1988
+*************** Dump of Entire IMFS ***************
+/
+    dev/
+        console (device 0, 0)
+        tty/
+            S3 (device 255, 128)
+        test_console (device 0, 0)
+    etc/
+        passwd (file 0 0x0 0x0 0x0)
+    tmp/
+        j (file 40 0x37f530 0x0 0x0)
+***************       End of Dump        ***************
+truncate /tmp/j to length of 0
+truncate /tmp to length of 0 should fail with EISDIR
+
+21: Is a directory
+*************** Dump of Entire IMFS ***************
+/
+    dev/
+        console (device 0, 0)
+        tty/
+            S3 (device 255, 128)
+        test_console (device 0, 0)
+    etc/
+        passwd (file 0 0x0 0x0 0x0)
+    tmp/
+        j (file 0 0x37f530 0x0 0x0)
+***************       End of Dump        ***************
+*** END OF FILE TEST 1 ***