Remove unnecessary uses of restore_include_path() in tests

diff --git a/ext/standard/tests/file/file_get_contents_variation1.phpt b/ext/standard/tests/file/file_get_contents_variation1.phpt
index 12bfd325ae7f02602156f946f9b5b375160c6f40..eb502e05277a4281f3e5baa6c71495bb079d6da3 100644 (file)
--- a/ext/standard/tests/file/file_get_contents_variation1.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation1.phpt
@@ -28,7 +28,6 @@ $newpath = create_include_path();
 set_include_path($newpath);
 runtest();
 teardown_include_path();
-restore_include_path();
 chdir("..");
 rmdir($thisTestDir);
 

diff --git a/ext/standard/tests/file/file_get_contents_variation2.phpt b/ext/standard/tests/file/file_get_contents_variation2.phpt
index c1f07d920fb85aa1bb7bc48e06b553ef12eec32e..8c24246aaacdde437cfbd8b2a43adbaacfe7885c 100644 (file)
--- a/ext/standard/tests/file/file_get_contents_variation2.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation2.phpt
@@ -29,7 +29,6 @@ $newpath = create_include_path();
 set_include_path($newpath);
 runtest();
 teardown_include_path();
-restore_include_path();
 chdir("..");
 rmdir($thisTestDir);
 

diff --git a/ext/standard/tests/file/file_put_contents_variation4.phpt b/ext/standard/tests/file/file_put_contents_variation4.phpt
index 339e9b73a7c6c7744b24301bd814ed5d5c8c2ca9..c7df0194ff02b475d7ff0b07ffa6830a48b61b2c 100644 (file)
--- a/ext/standard/tests/file/file_put_contents_variation4.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation4.phpt
@@ -28,7 +28,6 @@ set_include_path($newpath);
 runtest();
 
 teardown_include_path();
-restore_include_path();
 chdir("..");
 rmdir($thisTestDir);
 

diff --git a/ext/standard/tests/file/file_put_contents_variation6.phpt b/ext/standard/tests/file/file_put_contents_variation6.phpt
index 7f963a01fe40625f50ff21629d5f866b5234bafc..85f2aad3632bf25543573df633278a6453f3f5ca 100644 (file)
--- a/ext/standard/tests/file/file_put_contents_variation6.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation6.phpt
@@ -29,7 +29,6 @@ set_include_path($newpath);
 runtest();
 
 teardown_include_path();
-restore_include_path();
 chdir("..");
 rmdir($thisTestDir);
 

diff --git a/ext/standard/tests/file/fopen_variation12.phpt b/ext/standard/tests/file/fopen_variation12.phpt
index 91d482276af2be8b1475680f3d094cc5acfd6329..2f79be1b63fd56eb1072bc5fbbad372a0b3c70f6 100644 (file)
--- a/ext/standard/tests/file/fopen_variation12.phpt
+++ b/ext/standard/tests/file/fopen_variation12.phpt
@@ -12,7 +12,6 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 
 set_include_path("rubbish");
 testme();
-restore_include_path();
 
 
 function testme() {

diff --git a/ext/standard/tests/file/fopen_variation13.phpt b/ext/standard/tests/file/fopen_variation13.phpt
index 76cf084029b5c8f06e1203ec000278c48ef9e883..4d613a914545ce6f9bfcd5ad18189255219974ee 100644 (file)
--- a/ext/standard/tests/file/fopen_variation13.phpt
+++ b/ext/standard/tests/file/fopen_variation13.phpt
@@ -21,7 +21,6 @@ set_include_path($newpath);
 runtest();
 
 teardown_include_path();
-restore_include_path();
 
 
 function runtest() {

diff --git a/ext/standard/tests/file/fopen_variation16.phpt b/ext/standard/tests/file/fopen_variation16.phpt
index 023586c3968d358ab828612dccf2ce85c5c398a4..5888688fa89659bbd56e2132b7f3aff9eb47ef50 100644 (file)
--- a/ext/standard/tests/file/fopen_variation16.phpt
+++ b/ext/standard/tests/file/fopen_variation16.phpt
@@ -25,7 +25,6 @@ set_include_path($newpath);
 runtest();
 
 teardown_include_path();
-restore_include_path();
 chdir("..");
 rmdir($thisTestDir);
 

diff --git a/ext/standard/tests/file/fopen_variation17.phpt b/ext/standard/tests/file/fopen_variation17.phpt
index 429650564bcf251d4c077ed88df3de91d5a051c9..5d639e8236c935a0c5dee498e9cd2fc2cade0ed8 100644 (file)
--- a/ext/standard/tests/file/fopen_variation17.phpt
+++ b/ext/standard/tests/file/fopen_variation17.phpt
@@ -25,7 +25,6 @@ set_include_path($newpath);
 runtest();
 
 teardown_include_path();
-restore_include_path();
 chdir("..");
 rmdir($thisTestDir);
 

diff --git a/ext/standard/tests/file/fopen_variation5.phpt b/ext/standard/tests/file/fopen_variation5.phpt
index b5c7edbfbb1ff7dc2fd45b0dfc1064a6d256e524..a3f5c1d3be9036de68eb72bf83f4d9bbda1c5fe1 100644 (file)
--- a/ext/standard/tests/file/fopen_variation5.phpt
+++ b/ext/standard/tests/file/fopen_variation5.phpt
@@ -45,7 +45,6 @@ $modes = array("r", "r+", "rt");
 foreach($modes as $mode) {
     test_fopen($mode);
 }
-restore_include_path();
 
 // remove the directory structure
 chdir($baseDir);

diff --git a/ext/standard/tests/file/fopen_variation7.phpt b/ext/standard/tests/file/fopen_variation7.phpt
index 9cb40a00198b8d9d2c63500a83169d670acfe02f..531b27e0bc068bf3ddb32238bee0ab107abd49a5 100644 (file)
--- a/ext/standard/tests/file/fopen_variation7.phpt
+++ b/ext/standard/tests/file/fopen_variation7.phpt
@@ -24,7 +24,6 @@ set_include_path($newpath);
 runtest();
 
 teardown_include_path();
-restore_include_path();
 chdir("..");
 rmdir($thisTestDir);
 

diff --git a/ext/standard/tests/file/fopen_variation8.phpt b/ext/standard/tests/file/fopen_variation8.phpt
index 7e02aa8efe0122342af2dc889e8480bbdbc3f854..364719112893a347041953a696215d12225d9376 100644 (file)
--- a/ext/standard/tests/file/fopen_variation8.phpt
+++ b/ext/standard/tests/file/fopen_variation8.phpt
@@ -45,7 +45,6 @@ $modes = array("r", "r+", "rt");
 foreach($modes as $mode) {
     test_fopen($mode);
 }
-restore_include_path();
 
 // remove the directory structure
 chdir($baseDir);

diff --git a/ext/standard/tests/file/fopen_variation9.phpt b/ext/standard/tests/file/fopen_variation9.phpt
index bee941eb945e1e311d293c13efe20c08add14491..5479ddcf2d273c681c92fe90634355b1164c2e61 100644 (file)
--- a/ext/standard/tests/file/fopen_variation9.phpt
+++ b/ext/standard/tests/file/fopen_variation9.phpt
@@ -25,7 +25,6 @@ set_include_path($newpath);
 runtest();
 
 teardown_relative_path();
-restore_include_path();
 chdir("..");
 rmdir($thisTestDir);
 

diff --git a/ext/standard/tests/file/readfile_variation6.phpt b/ext/standard/tests/file/readfile_variation6.phpt
index dca6f4df673915bf806075ebbec0da19af2148e6..38e0f239586b90f6169554c93099d4f692218472 100644 (file)
--- a/ext/standard/tests/file/readfile_variation6.phpt
+++ b/ext/standard/tests/file/readfile_variation6.phpt
@@ -27,7 +27,6 @@ $newpath = create_include_path();
 set_include_path($newpath);
 runtest();
 teardown_include_path();
-restore_include_path();
 chdir("..");
 rmdir($thisTestDir);
 

diff --git a/ext/standard/tests/file/readfile_variation7.phpt b/ext/standard/tests/file/readfile_variation7.phpt
index 601453573e2eebe5212417da7baa49df2447a647..955d77bd275c8e66d70295dbf56b49cbaea51ed9 100644 (file)
--- a/ext/standard/tests/file/readfile_variation7.phpt
+++ b/ext/standard/tests/file/readfile_variation7.phpt
@@ -27,7 +27,6 @@ $newpath = create_include_path();
 set_include_path($newpath);
 runtest();
 teardown_include_path();
-restore_include_path();
 chdir("..");
 rmdir($thisTestDir);
 

diff --git a/ext/zlib/tests/gzfile_variation15.phpt b/ext/zlib/tests/gzfile_variation15.phpt
index 866348efa0e93f03db08b85ae150b0fb2be86435..77028fbd09a92570c831f82c07d0ec11982c795d 100644 (file)
--- a/ext/zlib/tests/gzfile_variation15.phpt
+++ b/ext/zlib/tests/gzfile_variation15.phpt
@@ -14,7 +14,6 @@ require_once('reading_include_path.inc');
 //define the files to go into these directories, create one in dir2
 set_include_path($newIncludePath);
 test_gzfile();
-restore_include_path();
 
 // remove the directory structure
 chdir($baseDir);

diff --git a/ext/zlib/tests/gzopen_variation4.phpt b/ext/zlib/tests/gzopen_variation4.phpt
index 1648b75fb96fd1856467d6b8e70eb2aba47119d3..6a00c30670fc7c9161c77e43cd5ad28c67cf6013 100644 (file)
--- a/ext/zlib/tests/gzopen_variation4.phpt
+++ b/ext/zlib/tests/gzopen_variation4.phpt
@@ -26,7 +26,6 @@ $modes = array("r", "r+", "rt");
 foreach($modes as $mode) {
     test_gzopen($mode);
 }
-restore_include_path();
 
 // remove the directory structure
 chdir($baseDir);

diff --git a/ext/zlib/tests/gzopen_variation5.phpt b/ext/zlib/tests/gzopen_variation5.phpt
index c223efeb15dca4dac5550eab7edcc2b224718ad5..99ba6a0b963e0c294f8a99061a83365858d52ed6 100644 (file)
--- a/ext/zlib/tests/gzopen_variation5.phpt
+++ b/ext/zlib/tests/gzopen_variation5.phpt
@@ -29,7 +29,6 @@ set_include_path($newpath);
 runtest();
 
 teardown_relative_path();
-restore_include_path();
 chdir("..");
 rmdir($thisTestDir);
 

diff --git a/ext/zlib/tests/readgzfile_variation15.phpt b/ext/zlib/tests/readgzfile_variation15.phpt
index 48115c7fdb828f0545e3d4d0857c78ee06f6470d..70f566446ec6d07ace4bac31af088619d184f6b2 100644 (file)
--- a/ext/zlib/tests/readgzfile_variation15.phpt
+++ b/ext/zlib/tests/readgzfile_variation15.phpt
@@ -14,7 +14,6 @@ require_once('reading_include_path.inc');
 //define the files to go into these directories, create one in dir2
 set_include_path($newIncludePath);
 test_readgzfile();
-restore_include_path();
 
 // remove the directory structure
 chdir($baseDir);