From 0edeb118db37fb7949e7e92473b48eec7262d302 Mon Sep 17 00:00:00 2001
From: ptarjan <ptarjan@fb.com>
Date: Thu, 18 Apr 2013 02:22:29 -0700
Subject: [PATCH] fix zend importer

I broke this during the test refactor. And now a few more tests pass, yay.
---
 hphp/test/zend/{bad => good}/zend/bug62680.php            | 0
 hphp/test/zend/{bad => good}/zend/bug62680.php.expectf    | 0
 hphp/test/zend/{bad => good}/zend/closure_033.php         | 0
 hphp/test/zend/{bad => good}/zend/closure_033.php.expectf | 0
 hphp/tools/import_zend_test.py                            | 6 +++++-
 5 files changed, 5 insertions(+), 1 deletion(-)
 rename hphp/test/zend/{bad => good}/zend/bug62680.php (100%)
 rename hphp/test/zend/{bad => good}/zend/bug62680.php.expectf (100%)
 rename hphp/test/zend/{bad => good}/zend/closure_033.php (100%)
 rename hphp/test/zend/{bad => good}/zend/closure_033.php.expectf (100%)
 mode change 100644 => 100755 hphp/tools/import_zend_test.py

diff --git a/hphp/test/zend/bad/zend/bug62680.php b/hphp/test/zend/good/zend/bug62680.php
similarity index 100%
rename from hphp/test/zend/bad/zend/bug62680.php
rename to hphp/test/zend/good/zend/bug62680.php
diff --git a/hphp/test/zend/bad/zend/bug62680.php.expectf b/hphp/test/zend/good/zend/bug62680.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/bug62680.php.expectf
rename to hphp/test/zend/good/zend/bug62680.php.expectf
diff --git a/hphp/test/zend/bad/zend/closure_033.php b/hphp/test/zend/good/zend/closure_033.php
similarity index 100%
rename from hphp/test/zend/bad/zend/closure_033.php
rename to hphp/test/zend/good/zend/closure_033.php
diff --git a/hphp/test/zend/bad/zend/closure_033.php.expectf b/hphp/test/zend/good/zend/closure_033.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/closure_033.php.expectf
rename to hphp/test/zend/good/zend/closure_033.php.expectf
diff --git a/hphp/tools/import_zend_test.py b/hphp/tools/import_zend_test.py
old mode 100644
new mode 100755
index 0d6623678..5d461a71c
--- a/hphp/tools/import_zend_test.py
+++ b/hphp/tools/import_zend_test.py
@@ -57,6 +57,10 @@ bad_tests = (
 
     # line number is inconsistent on stack overflow
     'bug41633_3.php',
+
+    # broken in Jenkins
+    'bug35239.php',
+    'bug54265.php',
 )
 
 errors = (
@@ -302,7 +306,7 @@ print "Running all tests from zend/all"
 stdout = subprocess.Popen(
     [
         'tools/verify_to_json.php',
-        '../test/run',
+        'test/run',
         'test/zend/all',
         'interp',
         '0',