From e35a679e74916ed88dd7396145ff10b781b918d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Langhorst?= Date: Wed, 21 Mar 2001 12:47:46 +0000 Subject: [PATCH] more win32 fixes --- tests/lang/018.phpt | 1 - tests/lang/019.phpt | 1 - tests/lang/020.phpt | 1 - tests/lang/021.phpt | 1 - tests/lang/022.phpt | 1 - tests/lang/023.phpt | 3 -- tests/lang/024.phpt | 107 +---------------------------------------- tests/lang/025.phpt | 1 - tests/lang/028.phpt | 1 - tests/strings/001.phpt | 1 - tests/strings/002.phpt | 1 - tests/strings/003.phpt | 1 - 12 files changed, 2 insertions(+), 118 deletions(-) diff --git a/tests/lang/018.phpt b/tests/lang/018.phpt index 81bed37bc86..8ef867cb62e 100644 --- a/tests/lang/018.phpt +++ b/tests/lang/018.phpt @@ -14,7 +14,6 @@ for ($i=0; $i<10; $i++) { echo $i."\n"; } --EXPECT-- - hey 0 hey diff --git a/tests/lang/019.phpt b/tests/lang/019.phpt index 5d6ddbdbcd1..43ab7e29e6b 100644 --- a/tests/lang/019.phpt +++ b/tests/lang/019.phpt @@ -16,7 +16,6 @@ while ($i<10) { $i++; } --EXPECT-- - hey, this is a regular echo'd eval() hey, this is a function inside an eval()! hey, this is a regular echo'd eval() diff --git a/tests/lang/020.phpt b/tests/lang/020.phpt index b18f00e4b5e..e82ba6c467a 100644 --- a/tests/lang/020.phpt +++ b/tests/lang/020.phpt @@ -46,7 +46,6 @@ switch (1) { } ?> --EXPECT-- - In branch 1 Inner default... blah=100 diff --git a/tests/lang/021.phpt b/tests/lang/021.phpt index 15fcf9d21b1..132ffc20c4a 100644 --- a/tests/lang/021.phpt +++ b/tests/lang/021.phpt @@ -33,7 +33,6 @@ for ($i=0; $i<=5; $i++) echo "hi\n"; ?> --EXPECT-- - i=0 In branch 0 i=1 diff --git a/tests/lang/022.phpt b/tests/lang/022.phpt index d70ea0e28de..5c07f7d7915 100644 --- a/tests/lang/022.phpt +++ b/tests/lang/022.phpt @@ -33,7 +33,6 @@ for ($i=0; $i<3; $i++) { } ?> --EXPECT-- - zero one 2 diff --git a/tests/lang/023.phpt b/tests/lang/023.phpt index 4773c8c2feb..4d7c4d5b5b0 100644 --- a/tests/lang/023.phpt +++ b/tests/lang/023.phpt @@ -23,8 +23,6 @@ if ($time_left>0) { } else { echo "Limor Ullmann is now Limor Baruch :I\n"; } - - ?> --EXPECT-- PHP Regression Test @@ -154,7 +152,6 @@ ${test21}[2] = 5
${test22}[0] = 4
${test22}[1] = 5
${test22}[2] = 6
- *********************
*** hash test... ***
diff --git a/tests/lang/024.phpt b/tests/lang/024.phpt index 5c8024dc7e2..848c5fbea85 100644 --- a/tests/lang/024.phpt +++ b/tests/lang/024.phpt @@ -5,9 +5,7 @@ Looped regression test (may take a while) --FILE-- - - +?> - +} ?> --EXPECT-- - *** Testing assignments and variable aliasing: *** @@ -602,8 +598,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -829,8 +823,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -1056,8 +1048,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -1283,8 +1273,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -1510,8 +1498,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -1737,8 +1723,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -1964,8 +1948,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -2191,8 +2173,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -2418,8 +2398,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -2645,8 +2623,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -2872,8 +2848,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -3099,8 +3073,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -3326,8 +3298,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -3553,8 +3523,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -3780,8 +3748,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -4007,8 +3973,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -4234,8 +4198,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -4461,8 +4423,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -4688,8 +4648,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -4915,8 +4873,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -5142,8 +5098,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -5369,8 +5323,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -5596,8 +5548,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -5823,8 +5773,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -6050,8 +5998,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -6277,8 +6223,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -6504,8 +6448,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -6731,8 +6673,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -6958,8 +6898,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -7185,8 +7123,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -7412,8 +7348,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -7639,8 +7573,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -7866,8 +7798,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -8093,8 +8023,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -8320,8 +8248,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -8547,8 +8473,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -8774,8 +8698,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -9001,8 +8923,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -9228,8 +9148,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -9455,8 +9373,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -9682,8 +9598,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -9909,8 +9823,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -10136,8 +10048,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -10363,8 +10273,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -10590,8 +10498,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -10817,8 +10723,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -11044,8 +10948,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -11271,8 +11173,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -11498,8 +11398,6 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - - *** Testing assignments and variable aliasing: *** @@ -11725,4 +11623,3 @@ and this is PHP code, 2+2=4 ******************************** Tests completed. - diff --git a/tests/lang/025.phpt b/tests/lang/025.phpt index 1f9884b29cf..34e0e8d6f47 100644 --- a/tests/lang/025.phpt +++ b/tests/lang/025.phpt @@ -26,7 +26,6 @@ echo "\n"; RekTest(0); ?> --EXPECT-- - 0 a 1 a 2 a 3 a 4 a 5 a 6 a 7 a 8 a 9 b 10 b 9 a 9 diff --git a/tests/lang/028.phpt b/tests/lang/028.phpt index 4fee8c3be7d..11ba8316016 100644 --- a/tests/lang/028.phpt +++ b/tests/lang/028.phpt @@ -55,7 +55,6 @@ print $name=call_user_method("GetMyName", $dafna); print "\n"; ?> - --EXPECT-- 0 Dafna! diff --git a/tests/strings/001.phpt b/tests/strings/001.phpt index 0f6103f5e39..4eacb895927 100644 --- a/tests/strings/001.phpt +++ b/tests/strings/001.phpt @@ -191,7 +191,6 @@ if (strlen($ui1) == strlen($ui2) && strlen($ui1) == 19 && $ui1 != $ui2) { ?> --EXPECT-- - Testing strtok: passed Testing strstr: passed Testing strrchr: passed diff --git a/tests/strings/002.phpt b/tests/strings/002.phpt index 06ca6c491cb..50c0b352871 100644 --- a/tests/strings/002.phpt +++ b/tests/strings/002.phpt @@ -37,7 +37,6 @@ printf("printf test 25:%-2s\n", "gazonk"); ?> --EXPECT-- - printf test 1:simple string printf test 2:42 printf test 3:3.333333 diff --git a/tests/strings/003.phpt b/tests/strings/003.phpt index 270f9d53297..f7d754988b0 100644 --- a/tests/strings/003.phpt +++ b/tests/strings/003.phpt @@ -9,6 +9,5 @@ echo htmlspecialchars ("<>\"& echo htmlentities ("<>\"&εΔ\n"); ?> --EXPECT-- - <>"&εΔ <>"&åÄ