Skip to content

Commit 902de2c

Browse files
committed
Attempt to bless tests (ext/standard/tests/file)
I'm applying the needed test output changes to a limited set of tests to see what needs to be changed with bless, and what output needs to be fixed with bless. Some issues I remember fixing: - the fscanf tests pass format strings that now become visible as function parameters in the expect section, so i had to manually change these to %s - some tests have output that could be either, bless changed to only the specific output i got (change it back) - some cases of filenames outside the function params occuring that bless missed, cleaned those up
1 parent 8ec16f9 commit 902de2c

File tree

121 files changed

+964
-964
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+964
-964
lines changed

ext/standard/tests/file/005_error.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ echo "\nDone";
1818
*** Testing error conditions ***
1919

2020
-- Testing with Non-existing files --
21-
Warning: fileatime(): stat failed for /no/such/file/or/dir in %s on line %d
21+
Warning: fileatime('%s'): stat failed for /no/such/file/or/dir in %s on line %d
2222
bool(false)
2323

24-
Warning: filemtime(): stat failed for /no/such/file/or/dir in %s on line %d
24+
Warning: filemtime('%s'): stat failed for /no/such/file/or/dir in %s on line %d
2525
bool(false)
2626

27-
Warning: filectime(): stat failed for /no/such/file/or/dir in %s on line %d
27+
Warning: filectime('%s'): stat failed for /no/such/file/or/dir in %s on line %d
2828
bool(false)
2929

30-
Warning: touch(): Unable to create file /no/such/file/or/dir because No such file or directory in %s on line %d
30+
Warning: touch('%s', 10): Unable to create file /no/such/file/or/dir because No such file or directory in %s on line %d
3131
bool(false)
3232

3333
Done

ext/standard/tests/file/006_error.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@ echo "\n*** Done ***\n";
3232
--EXPECTF--
3333
*** Testing error conditions for fileperms(), chmod() ***
3434

35-
Warning: chmod(): %s in %s on line %d
35+
Warning: chmod('/etc/passwd', 511): Operation not permitted in %s on line %d
3636
bool(false)
3737
100%d44
3838

39-
Warning: chmod(): %s in %s on line %d
39+
Warning: chmod('/etc', 511): Operation not permitted in %s on line %d
4040
bool(false)
4141
40755
4242

43-
Warning: chmod(): No such file or directory in %s on line %d
43+
Warning: chmod('%s', 511): No such file or directory in %s on line %d
4444
bool(false)
4545

46-
Warning: fileperms(): stat failed for /no/such/file/dir in %s on line %d
46+
Warning: fileperms('%s'): stat failed for /no/such/file/dir in %s on line %d
4747
bool(false)
4848

4949

ext/standard/tests/file/007_variation1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ string(20) "line
3838
line of text
3939
li"
4040

41-
Notice: fwrite(): Write of 37 bytes failed with errno=9 Bad file descriptor in %s on line %d
41+
Notice: fwrite(Resource id #%d, 'abcdefghij\nmnop...'): Write of 37 bytes failed with errno=9 Bad file descriptor in %s on line %d
4242
bool(false)
4343
bool(true)
4444
string(7) "Unknown"

ext/standard/tests/file/007_variation11.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ int(0)
5656
int(37)
5757
int(37)
5858

59-
Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
59+
Notice: fread(Resource id #%d, 100): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
6060
bool(false)
6161
int(0)
6262
bool(true)

ext/standard/tests/file/007_variation13.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ resource(%d) of type (stream)
4646
string(6) "stream"
4747
int(37)
4848

49-
Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
49+
Notice: fread(Resource id #%d, 100): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
5050
bool(false)
5151
int(0)
5252
bool(true)

ext/standard/tests/file/007_variation15.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ int(0)
4848
int(37)
4949
int(37)
5050

51-
Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
51+
Notice: fread(Resource id #%d, 100): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
5252
bool(false)
5353
int(0)
5454
bool(true)

ext/standard/tests/file/007_variation17.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ string(20) "line
3838
line of text
3939
li"
4040

41-
Notice: fwrite(): Write of 37 bytes failed with errno=9 Bad file descriptor in %s on line %d
41+
Notice: fwrite(Resource id #%d, 'abcdefghij\nmnop...'): Write of 37 bytes failed with errno=9 Bad file descriptor in %s on line %d
4242
bool(false)
4343
bool(true)
4444
string(7) "Unknown"

ext/standard/tests/file/007_variation19.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ int(0)
5151
int(37)
5252
int(37)
5353

54-
Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
54+
Notice: fread(Resource id #%d, 100): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
5555
bool(false)
5656
int(0)
5757
bool(true)

ext/standard/tests/file/007_variation21.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ resource(%d) of type (stream)
4141
string(6) "stream"
4242
int(37)
4343

44-
Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
44+
Notice: fread(Resource id #%d, 100): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
4545
bool(false)
4646
int(0)
4747
bool(true)

ext/standard/tests/file/007_variation23.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ int(0)
3939
int(37)
4040
int(37)
4141

42-
Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
42+
Notice: fread(Resource id #%d, 100): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d
4343
bool(false)
4444
int(0)
4545
bool(true)

0 commit comments

Comments
 (0)