From 2589e072fbea3a90551483c88809b98847befc2a Mon Sep 17 00:00:00 2001
From: Paul Tarjan <ptarjan@fb.com>
Date: Wed, 24 Apr 2013 12:14:58 -0700
Subject: [PATCH] mark 3 tests as segfaulting

---
 hphp/test/zend/good/zend/001.php         | 34 ------------------
 hphp/test/zend/good/zend/001.php.expectf | 13 -------
 hphp/test/zend/good/zend/002.php         | 41 ---------------------
 hphp/test/zend/good/zend/002.php.expectf | 45 ------------------------
 hphp/test/zend/good/zend/003.php         | 35 ------------------
 hphp/test/zend/good/zend/003.php.expectf | 39 --------------------
 hphp/tools/import_zend_test.py           |  5 +++
 7 files changed, 5 insertions(+), 207 deletions(-)
 delete mode 100644 hphp/test/zend/good/zend/001.php
 delete mode 100644 hphp/test/zend/good/zend/001.php.expectf
 delete mode 100644 hphp/test/zend/good/zend/002.php
 delete mode 100644 hphp/test/zend/good/zend/002.php.expectf
 delete mode 100644 hphp/test/zend/good/zend/003.php
 delete mode 100644 hphp/test/zend/good/zend/003.php.expectf

diff --git a/hphp/test/zend/good/zend/001.php b/hphp/test/zend/good/zend/001.php
deleted file mode 100644
index 44950d22f..000000000
--- a/hphp/test/zend/good/zend/001.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-function test1() {
-	var_dump(func_num_args());
-}
-
-function test2($a) {
-	var_dump(func_num_args());
-}
-
-function test3($a, $b) {
-	var_dump(func_num_args());
-}
-
-test1();
-test2(1);
-test2();
-test3(1,2);
-
-call_user_func("test1");
-call_user_func("test3", 1);
-call_user_func("test3", 1, 2);
-
-class test {
-	static function test1($a) {
-		var_dump(func_num_args());
-	}
-}
-
-test::test1(1);
-var_dump(func_num_args());
-
-echo "Done\n";
-?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/zend/001.php.expectf b/hphp/test/zend/good/zend/001.php.expectf
deleted file mode 100644
index 6fda638ce..000000000
--- a/hphp/test/zend/good/zend/001.php.expectf
+++ /dev/null
@@ -1,13 +0,0 @@
-int(0)
-int(1)
-HipHop Warning: %a
-int(0)
-int(2)
-int(0)
-HipHop Warning: %a
-int(1)
-int(2)
-int(1)
-HipHop Warning: %a
-int(-1)
-Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/zend/002.php b/hphp/test/zend/good/zend/002.php
deleted file mode 100644
index b3c4ea4a9..000000000
--- a/hphp/test/zend/good/zend/002.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-function test1() {
-	var_dump(func_get_arg(-10));
-	var_dump(func_get_arg(0));
-	var_dump(func_get_arg(1));
-}
-
-function test2($a) {
-	var_dump(func_get_arg(0));
-	var_dump(func_get_arg(1));
-}
-
-function test3($a, $b) {
-	var_dump(func_get_arg(0));
-	var_dump(func_get_arg(1));
-	var_dump(func_get_arg(2));
-}
-
-test1();
-test1(10);
-test2(1);
-test2();
-test3(1,2);
-
-call_user_func("test1");
-call_user_func("test3", 1);
-call_user_func("test3", 1, 2);
-
-class test {
-	static function test1($a) {
-		var_dump(func_get_arg(0));
-		var_dump(func_get_arg(1));
-	}
-}
-
-test::test1(1);
-var_dump(func_get_arg(1));
-
-echo "Done\n";
-?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/zend/002.php.expectf b/hphp/test/zend/good/zend/002.php.expectf
deleted file mode 100644
index b3081e9db..000000000
--- a/hphp/test/zend/good/zend/002.php.expectf
+++ /dev/null
@@ -1,45 +0,0 @@
-HipHop Warning: %a
-bool(false)
-HipHop Warning: %a
-bool(false)
-HipHop Warning: %a
-bool(false)
-HipHop Warning: %a
-bool(false)
-int(10)
-HipHop Warning: %a
-bool(false)
-int(1)
-HipHop Warning: %a
-bool(false)
-HipHop Warning: %a
-HipHop Warning: %a
-bool(false)
-HipHop Warning: %a
-bool(false)
-int(1)
-int(2)
-HipHop Warning: %a
-bool(false)
-HipHop Warning: %a
-bool(false)
-HipHop Warning: %a
-bool(false)
-HipHop Warning: %a
-bool(false)
-HipHop Warning: %a
-int(1)
-HipHop Warning: %a
-bool(false)
-HipHop Warning: %a
-bool(false)
-int(1)
-int(2)
-HipHop Warning: %a
-bool(false)
-int(1)
-HipHop Warning: %a
-bool(false)
-HipHop Warning: %a
-bool(false)
-Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/zend/003.php b/hphp/test/zend/good/zend/003.php
deleted file mode 100644
index 27e4d8e1f..000000000
--- a/hphp/test/zend/good/zend/003.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-function test1() {
-	var_dump(func_get_args());
-}
-
-function test2($a) {
-	var_dump(func_get_args());
-}
-
-function test3($a, $b) {
-	var_dump(func_get_args());
-}
-
-test1();
-test1(10);
-test2(1);
-test2();
-test3(1,2);
-
-call_user_func("test1");
-call_user_func("test3", 1);
-call_user_func("test3", 1, 2);
-
-class test {
-	static function test1($a) {
-		var_dump(func_get_args());
-	}
-}
-
-test::test1(1);
-var_dump(func_get_args());
-
-echo "Done\n";
-?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/zend/003.php.expectf b/hphp/test/zend/good/zend/003.php.expectf
deleted file mode 100644
index b034141df..000000000
--- a/hphp/test/zend/good/zend/003.php.expectf
+++ /dev/null
@@ -1,39 +0,0 @@
-array(0) {
-}
-array(1) {
-  [0]=>
-  int(10)
-}
-array(1) {
-  [0]=>
-  int(1)
-}
-HipHop Warning: %a
-array(0) {
-}
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-array(0) {
-}
-HipHop Warning: %a
-array(1) {
-  [0]=>
-  int(1)
-}
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-array(1) {
-  [0]=>
-  int(1)
-}
-HipHop Warning: %a
-bool(false)
-Done
\ No newline at end of file
diff --git a/hphp/tools/import_zend_test.py b/hphp/tools/import_zend_test.py
index 537c46647..b0f7fd7d6 100755
--- a/hphp/tools/import_zend_test.py
+++ b/hphp/tools/import_zend_test.py
@@ -109,6 +109,11 @@ no_import = (
     'session/tests/bug61728.phpt',
     'session/tests/session_module_name_variation2.phpt',
 
+    # intermittent segfaults
+    '/Zend/tests/001.phpt',
+    '/Zend/tests/002.phpt',
+    '/Zend/tests/003.phpt',
+
     # not imported yet, but will be
     '/ext/gd',
     '/ext/standard',