support 2 more sections

Support two more section keys and only print the message when using /all

hphp/test/zend/bad/tests-func/010.php

@@ -54,4 +54,6 @@ include($filename);
 
 echo "Done\n";
 
+?><?php
+@unlink(dirname(__FILE__).'/010-file.php');
 ?>

hphp/test/zend/bad/tests-security/open_basedir_linkinfo.php

@@ -26,4 +26,7 @@ var_dump(linkinfo($symlink));
 var_dump(unlink($symlink));
 
 test_open_basedir_after("linkinfo");
+?><?php
+require_once "open_basedir.inc";
+delete_directories();
 ?>

hphp/test/zend/bad/tests-security/open_basedir_readlink.php

@@ -25,4 +25,7 @@ var_dump(symlink($target, $symlink));
 var_dump(readlink($symlink));
 
 test_open_basedir_after("readlink");
+?><?php
+require_once "open_basedir.inc";
+delete_directories();
 ?>

hphp/test/zend/bad/zend/halt_compiler2.php

@@ -8,4 +8,7 @@ file_put_contents(dirname(__FILE__) . '/test2.php', $text);
 include dirname(__FILE__) . '/test1.php';
 include dirname(__FILE__) . '/test2.php';
 ?>
-==DONE==
+==DONE==<?php
+unlink(dirname(__FILE__) . '/test1.php');
+unlink(dirname(__FILE__) . '/test2.php');
+?>

hphp/tools/import_zend_test.py

@@ -206,6 +206,16 @@ def walk(filename, source):
             '<?php', 
             '<?php\n$_COOKIE = http_parse_cookie("' + sections['COOKIE'] + '");\n'
         )
+    if sections.has_key('ENV'):
+        for line in sections['ENV'].split('\n'):
+            boom = line.split('=')
+            if len(boom) == 2 and boom[0] and boom[1]:
+                test = test.replace(
+                    '<?php',
+                    '<?php\n$_ENV[%s] = %s;\n' % (boom[0], boom[1])
+                )
+    if sections.has_key('CLEAN'):
+        test += sections['CLEAN']
 
     if 'bug60771.php' in full_dest_filename:
         test = test.replace("?>", "unlink('test.php');\n?>")
@@ -300,8 +310,8 @@ if not os.path.isdir('test/zend/all'):
     else:
         print "Running all tests from test/zend/bad"
         shutil.copytree('test/zend/bad', 'test/zend/all')
-
-print "Running all tests from zend/all"
+else:
+    print "Running all tests from zend/all"
 
 stdout = subprocess.Popen(
     [