From e433cd193c642b2ee960e78522ea9406cc7b349d Mon Sep 17 00:00:00 2001 From: Paul Tarjan Date: Sun, 19 May 2013 01:45:33 -0700 Subject: [PATCH] move compiled tests files into another dir I've been linking people to the README in this directory, but it is hard to see with all these files in here. What do people think about it moving a subdirectory? I don't love the name. --- hphp/doc/extension.development | 10 +- hphp/test/CMakeLists.txt | 1 - hphp/test/{ => ext}/main.cpp | 2 +- hphp/test/{ => ext}/test.cpp | 2 +- hphp/test/{ => ext}/test.h | 2 +- hphp/test/{ => ext}/test_all.cpp | 13 +- hphp/test/{ => ext}/test_base.cpp | 4 +- hphp/test/{ => ext}/test_base.h | 2 +- hphp/test/{ => ext}/test_code_error.cpp | 4 +- hphp/test/{ => ext}/test_code_error.h | 4 +- hphp/test/{ => ext}/test_code_run.cpp | 4 +- hphp/test/{ => ext}/test_code_run.h | 2 +- hphp/test/{ => ext}/test_cpp_base.cpp | 4 +- hphp/test/{ => ext}/test_cpp_base.h | 2 +- hphp/test/{ => ext}/test_cpp_ext.cpp | 2 +- hphp/test/{ => ext}/test_cpp_ext.h | 2 +- hphp/test/{ => ext}/test_debugger.cpp | 4 +- hphp/test/{ => ext}/test_debugger.h | 2 +- hphp/test/ext/test_ext.h | 106 +++++++ hphp/test/{ => ext}/test_ext_apache.cpp | 2 +- hphp/test/{ => ext}/test_ext_apache.h | 2 +- hphp/test/{ => ext}/test_ext_apc.cpp | 2 +- hphp/test/{ => ext}/test_ext_apc.h | 2 +- hphp/test/{ => ext}/test_ext_apd.cpp | 2 +- hphp/test/{ => ext}/test_ext_apd.h | 2 +- hphp/test/{ => ext}/test_ext_array.cpp | 2 +- hphp/test/{ => ext}/test_ext_array.h | 2 +- hphp/test/{ => ext}/test_ext_asio.cpp | 2 +- hphp/test/{ => ext}/test_ext_asio.h | 2 +- hphp/test/{ => ext}/test_ext_bcmath.cpp | 2 +- hphp/test/{ => ext}/test_ext_bcmath.h | 2 +- hphp/test/{ => ext}/test_ext_bzip2.cpp | 2 +- hphp/test/{ => ext}/test_ext_bzip2.h | 2 +- hphp/test/{ => ext}/test_ext_class.cpp | 2 +- hphp/test/{ => ext}/test_ext_class.h | 2 +- hphp/test/{ => ext}/test_ext_closure.cpp | 2 +- hphp/test/{ => ext}/test_ext_closure.h | 2 +- hphp/test/{ => ext}/test_ext_collections.cpp | 2 +- hphp/test/{ => ext}/test_ext_collections.h | 2 +- hphp/test/{ => ext}/test_ext_continuation.cpp | 2 +- hphp/test/{ => ext}/test_ext_continuation.h | 2 +- hphp/test/{ => ext}/test_ext_ctype.cpp | 2 +- hphp/test/{ => ext}/test_ext_ctype.h | 2 +- hphp/test/{ => ext}/test_ext_curl.cpp | 2 +- hphp/test/{ => ext}/test_ext_curl.h | 2 +- hphp/test/{ => ext}/test_ext_datetime.cpp | 2 +- hphp/test/{ => ext}/test_ext_datetime.h | 2 +- hphp/test/{ => ext}/test_ext_debugger.cpp | 2 +- hphp/test/{ => ext}/test_ext_debugger.h | 2 +- hphp/test/{ => ext}/test_ext_domdocument.cpp | 2 +- hphp/test/{ => ext}/test_ext_domdocument.h | 2 +- hphp/test/{ => ext}/test_ext_error.cpp | 2 +- hphp/test/{ => ext}/test_ext_error.h | 2 +- hphp/test/{ => ext}/test_ext_fb.cpp | 2 +- hphp/test/{ => ext}/test_ext_fb.h | 2 +- hphp/test/{ => ext}/test_ext_file.cpp | 2 +- hphp/test/{ => ext}/test_ext_file.h | 2 +- hphp/test/{ => ext}/test_ext_function.cpp | 2 +- hphp/test/{ => ext}/test_ext_function.h | 2 +- hphp/test/{ => ext}/test_ext_hash.cpp | 2 +- hphp/test/{ => ext}/test_ext_hash.h | 2 +- hphp/test/{ => ext}/test_ext_iconv.cpp | 2 +- hphp/test/{ => ext}/test_ext_iconv.h | 2 +- hphp/test/{ => ext}/test_ext_icu.cpp | 2 +- hphp/test/{ => ext}/test_ext_icu.h | 2 +- hphp/test/{ => ext}/test_ext_icu_ucnv.cpp | 2 +- hphp/test/{ => ext}/test_ext_icu_ucnv.h | 2 +- hphp/test/{ => ext}/test_ext_icu_ucsdet.cpp | 2 +- hphp/test/{ => ext}/test_ext_icu_ucsdet.h | 2 +- hphp/test/{ => ext}/test_ext_icu_uspoof.cpp | 2 +- hphp/test/{ => ext}/test_ext_icu_uspoof.h | 2 +- hphp/test/{ => ext}/test_ext_image.cpp | 2 +- hphp/test/{ => ext}/test_ext_image.h | 2 +- hphp/test/{ => ext}/test_ext_imagesprite.cpp | 2 +- hphp/test/{ => ext}/test_ext_imagesprite.h | 2 +- hphp/test/{ => ext}/test_ext_imap.cpp | 2 +- hphp/test/{ => ext}/test_ext_imap.h | 2 +- hphp/test/{ => ext}/test_ext_intl.cpp | 2 +- hphp/test/{ => ext}/test_ext_intl.h | 2 +- hphp/test/{ => ext}/test_ext_ipc.cpp | 2 +- hphp/test/{ => ext}/test_ext_ipc.h | 2 +- hphp/test/{ => ext}/test_ext_json.cpp | 2 +- hphp/test/{ => ext}/test_ext_json.h | 2 +- hphp/test/{ => ext}/test_ext_ldap.cpp | 2 +- hphp/test/{ => ext}/test_ext_ldap.h | 2 +- hphp/test/{ => ext}/test_ext_magick.cpp | 2 +- hphp/test/{ => ext}/test_ext_magick.h | 2 +- hphp/test/{ => ext}/test_ext_mailparse.cpp | 6 +- hphp/test/{ => ext}/test_ext_mailparse.h | 2 +- .../{ => ext}/test_ext_mailparse.mime.exp | 0 .../{ => ext}/test_ext_mailparse.mime.txt | 94 +++--- .../{ => ext}/test_ext_mailparse.phpcvs1.exp | 0 .../{ => ext}/test_ext_mailparse.phpcvs1.txt | 282 +++++++++--------- hphp/test/{ => ext}/test_ext_mailparse.qp.exp | 0 hphp/test/{ => ext}/test_ext_mailparse.qp.txt | 94 +++--- .../test/{ => ext}/test_ext_mailparse.uue.exp | 0 .../test/{ => ext}/test_ext_mailparse.uue.txt | 54 ++-- hphp/test/{ => ext}/test_ext_math.cpp | 2 +- hphp/test/{ => ext}/test_ext_math.h | 2 +- hphp/test/{ => ext}/test_ext_mb.cpp | 2 +- hphp/test/{ => ext}/test_ext_mb.h | 2 +- hphp/test/{ => ext}/test_ext_mcrypt.cpp | 2 +- hphp/test/{ => ext}/test_ext_mcrypt.h | 2 +- hphp/test/{ => ext}/test_ext_memcache.cpp | 2 +- hphp/test/{ => ext}/test_ext_memcache.h | 2 +- hphp/test/{ => ext}/test_ext_memcached.cpp | 2 +- hphp/test/{ => ext}/test_ext_memcached.h | 2 +- hphp/test/{ => ext}/test_ext_misc.cpp | 2 +- hphp/test/{ => ext}/test_ext_misc.h | 2 +- hphp/test/{ => ext}/test_ext_mysql.cpp | 4 +- hphp/test/{ => ext}/test_ext_mysql.h | 2 +- hphp/test/{ => ext}/test_ext_network.cpp | 2 +- hphp/test/{ => ext}/test_ext_network.h | 2 +- hphp/test/{ => ext}/test_ext_openssl.cpp | 2 +- hphp/test/{ => ext}/test_ext_openssl.h | 2 +- hphp/test/{ => ext}/test_ext_options.cpp | 2 +- hphp/test/{ => ext}/test_ext_options.h | 2 +- hphp/test/{ => ext}/test_ext_output.cpp | 2 +- hphp/test/{ => ext}/test_ext_output.h | 2 +- hphp/test/{ => ext}/test_ext_pdo.cpp | 4 +- hphp/test/{ => ext}/test_ext_pdo.h | 2 +- hphp/test/{ => ext}/test_ext_posix.cpp | 4 +- hphp/test/{ => ext}/test_ext_posix.h | 2 +- hphp/test/{ => ext}/test_ext_preg.cpp | 2 +- hphp/test/{ => ext}/test_ext_preg.h | 2 +- hphp/test/{ => ext}/test_ext_process.cpp | 20 +- hphp/test/{ => ext}/test_ext_process.h | 2 +- hphp/test/{ => ext}/test_ext_reflection.cpp | 2 +- hphp/test/{ => ext}/test_ext_reflection.h | 2 +- hphp/test/{ => ext}/test_ext_server.cpp | 2 +- hphp/test/{ => ext}/test_ext_server.h | 2 +- hphp/test/{ => ext}/test_ext_session.cpp | 2 +- hphp/test/{ => ext}/test_ext_session.h | 2 +- hphp/test/{ => ext}/test_ext_simplexml.cpp | 2 +- hphp/test/{ => ext}/test_ext_simplexml.h | 2 +- hphp/test/{ => ext}/test_ext_soap.cpp | 2 +- hphp/test/{ => ext}/test_ext_soap.h | 2 +- hphp/test/{ => ext}/test_ext_socket.cpp | 2 +- hphp/test/{ => ext}/test_ext_socket.h | 2 +- hphp/test/{ => ext}/test_ext_spl.cpp | 2 +- hphp/test/{ => ext}/test_ext_spl.h | 2 +- hphp/test/{ => ext}/test_ext_sqlite3.cpp | 2 +- hphp/test/{ => ext}/test_ext_sqlite3.h | 2 +- hphp/test/{ => ext}/test_ext_stream.cpp | 2 +- hphp/test/{ => ext}/test_ext_stream.h | 2 +- hphp/test/{ => ext}/test_ext_string.cpp | 2 +- hphp/test/{ => ext}/test_ext_string.h | 2 +- hphp/test/{ => ext}/test_ext_thread.cpp | 2 +- hphp/test/{ => ext}/test_ext_thread.h | 2 +- hphp/test/{ => ext}/test_ext_thrift.cpp | 2 +- hphp/test/{ => ext}/test_ext_thrift.h | 2 +- hphp/test/{ => ext}/test_ext_url.cpp | 4 +- hphp/test/{ => ext}/test_ext_url.h | 2 +- hphp/test/{ => ext}/test_ext_variable.cpp | 2 +- hphp/test/{ => ext}/test_ext_variable.h | 2 +- hphp/test/{ => ext}/test_ext_xml.cpp | 2 +- hphp/test/{ => ext}/test_ext_xml.h | 2 +- hphp/test/{ => ext}/test_ext_xmlreader.cpp | 2 +- hphp/test/{ => ext}/test_ext_xmlreader.h | 2 +- hphp/test/{ => ext}/test_ext_xmlwriter.cpp | 2 +- hphp/test/{ => ext}/test_ext_xmlwriter.h | 2 +- hphp/test/{ => ext}/test_ext_zlib.cpp | 16 +- hphp/test/{ => ext}/test_ext_zlib.gz | Bin hphp/test/{ => ext}/test_ext_zlib.h | 2 +- hphp/test/{ => ext}/test_get_meta_tags.html | 0 hphp/test/{ => ext}/test_logger.cpp | 2 +- hphp/test/{ => ext}/test_logger.h | 0 hphp/test/{ => ext}/test_parser.cpp | 2 +- hphp/test/{ => ext}/test_parser.h | 2 +- hphp/test/{ => ext}/test_parser_expr.cpp | 2 +- hphp/test/{ => ext}/test_parser_expr.h | 2 +- hphp/test/{ => ext}/test_parser_stmt.cpp | 2 +- hphp/test/{ => ext}/test_parser_stmt.h | 2 +- hphp/test/{ => ext}/test_server.cpp | 2 +- hphp/test/{ => ext}/test_server.h | 2 +- hphp/test/{ => ext}/test_util.cpp | 2 +- hphp/test/{ => ext}/test_util.h | 2 +- hphp/test/test_base_suite.inc | 9 - hphp/tools/run_test_binary.sh | 2 +- 179 files changed, 574 insertions(+), 471 deletions(-) rename hphp/test/{ => ext}/main.cpp (98%) rename hphp/test/{ => ext}/test.cpp (99%) rename hphp/test/{ => ext}/test.h (99%) rename hphp/test/{ => ext}/test_all.cpp (83%) rename hphp/test/{ => ext}/test_base.cpp (97%) rename hphp/test/{ => ext}/test_base.h (99%) rename hphp/test/{ => ext}/test_code_error.cpp (99%) rename hphp/test/{ => ext}/test_code_error.h (95%) rename hphp/test/{ => ext}/test_code_run.cpp (99%) rename hphp/test/{ => ext}/test_code_run.h (98%) rename hphp/test/{ => ext}/test_cpp_base.cpp (99%) rename hphp/test/{ => ext}/test_cpp_base.h (98%) rename hphp/test/{ => ext}/test_cpp_ext.cpp (96%) rename hphp/test/{ => ext}/test_cpp_ext.h (98%) rename hphp/test/{ => ext}/test_debugger.cpp (99%) rename hphp/test/{ => ext}/test_debugger.h (98%) create mode 100644 hphp/test/ext/test_ext.h rename hphp/test/{ => ext}/test_ext_apache.cpp (98%) rename hphp/test/{ => ext}/test_ext_apache.h (98%) rename hphp/test/{ => ext}/test_ext_apc.cpp (99%) rename hphp/test/{ => ext}/test_ext_apc.h (98%) rename hphp/test/{ => ext}/test_ext_apd.cpp (98%) rename hphp/test/{ => ext}/test_ext_apd.h (97%) rename hphp/test/{ => ext}/test_ext_array.cpp (99%) rename hphp/test/{ => ext}/test_ext_array.h (98%) rename hphp/test/{ => ext}/test_ext_asio.cpp (98%) rename hphp/test/{ => ext}/test_ext_asio.h (97%) rename hphp/test/{ => ext}/test_ext_bcmath.cpp (98%) rename hphp/test/{ => ext}/test_ext_bcmath.h (97%) rename hphp/test/{ => ext}/test_ext_bzip2.cpp (98%) rename hphp/test/{ => ext}/test_ext_bzip2.h (97%) rename hphp/test/{ => ext}/test_ext_class.cpp (99%) rename hphp/test/{ => ext}/test_ext_class.h (97%) rename hphp/test/{ => ext}/test_ext_closure.cpp (96%) rename hphp/test/{ => ext}/test_ext_closure.h (97%) rename hphp/test/{ => ext}/test_ext_collections.cpp (96%) rename hphp/test/{ => ext}/test_ext_collections.h (97%) rename hphp/test/{ => ext}/test_ext_continuation.cpp (96%) rename hphp/test/{ => ext}/test_ext_continuation.h (97%) rename hphp/test/{ => ext}/test_ext_ctype.cpp (98%) rename hphp/test/{ => ext}/test_ext_ctype.h (97%) rename hphp/test/{ => ext}/test_ext_curl.cpp (99%) rename hphp/test/{ => ext}/test_ext_curl.h (98%) rename hphp/test/{ => ext}/test_ext_datetime.cpp (99%) rename hphp/test/{ => ext}/test_ext_datetime.h (98%) rename hphp/test/{ => ext}/test_ext_debugger.cpp (97%) rename hphp/test/{ => ext}/test_ext_debugger.h (97%) rename hphp/test/{ => ext}/test_ext_domdocument.cpp (98%) rename hphp/test/{ => ext}/test_ext_domdocument.h (98%) rename hphp/test/{ => ext}/test_ext_error.cpp (98%) rename hphp/test/{ => ext}/test_ext_error.h (97%) rename hphp/test/{ => ext}/test_ext_fb.cpp (99%) rename hphp/test/{ => ext}/test_ext_fb.h (97%) rename hphp/test/{ => ext}/test_ext_file.cpp (99%) rename hphp/test/{ => ext}/test_ext_file.h (98%) rename hphp/test/{ => ext}/test_ext_function.cpp (98%) rename hphp/test/{ => ext}/test_ext_function.h (98%) rename hphp/test/{ => ext}/test_ext_hash.cpp (99%) rename hphp/test/{ => ext}/test_ext_hash.h (97%) rename hphp/test/{ => ext}/test_ext_iconv.cpp (99%) rename hphp/test/{ => ext}/test_ext_iconv.h (97%) rename hphp/test/{ => ext}/test_ext_icu.cpp (99%) rename hphp/test/{ => ext}/test_ext_icu.h (97%) rename hphp/test/{ => ext}/test_ext_icu_ucnv.cpp (97%) rename hphp/test/{ => ext}/test_ext_icu_ucnv.h (97%) rename hphp/test/{ => ext}/test_ext_icu_ucsdet.cpp (99%) rename hphp/test/{ => ext}/test_ext_icu_ucsdet.h (98%) rename hphp/test/{ => ext}/test_ext_icu_uspoof.cpp (99%) rename hphp/test/{ => ext}/test_ext_icu_uspoof.h (97%) rename hphp/test/{ => ext}/test_ext_image.cpp (99%) rename hphp/test/{ => ext}/test_ext_image.h (99%) rename hphp/test/{ => ext}/test_ext_imagesprite.cpp (99%) rename hphp/test/{ => ext}/test_ext_imagesprite.h (97%) rename hphp/test/{ => ext}/test_ext_imap.cpp (99%) rename hphp/test/{ => ext}/test_ext_imap.h (98%) rename hphp/test/{ => ext}/test_ext_intl.cpp (99%) rename hphp/test/{ => ext}/test_ext_intl.h (98%) rename hphp/test/{ => ext}/test_ext_ipc.cpp (99%) rename hphp/test/{ => ext}/test_ext_ipc.h (98%) rename hphp/test/{ => ext}/test_ext_json.cpp (99%) rename hphp/test/{ => ext}/test_ext_json.h (97%) rename hphp/test/{ => ext}/test_ext_ldap.cpp (99%) rename hphp/test/{ => ext}/test_ext_ldap.h (98%) rename hphp/test/{ => ext}/test_ext_magick.cpp (96%) rename hphp/test/{ => ext}/test_ext_magick.h (99%) rename hphp/test/{ => ext}/test_ext_mailparse.cpp (98%) rename hphp/test/{ => ext}/test_ext_mailparse.h (98%) rename hphp/test/{ => ext}/test_ext_mailparse.mime.exp (100%) rename hphp/test/{ => ext}/test_ext_mailparse.mime.txt (96%) rename hphp/test/{ => ext}/test_ext_mailparse.phpcvs1.exp (100%) rename hphp/test/{ => ext}/test_ext_mailparse.phpcvs1.txt (97%) rename hphp/test/{ => ext}/test_ext_mailparse.qp.exp (100%) rename hphp/test/{ => ext}/test_ext_mailparse.qp.txt (96%) rename hphp/test/{ => ext}/test_ext_mailparse.uue.exp (100%) rename hphp/test/{ => ext}/test_ext_mailparse.uue.txt (97%) rename hphp/test/{ => ext}/test_ext_math.cpp (99%) rename hphp/test/{ => ext}/test_ext_math.h (98%) rename hphp/test/{ => ext}/test_ext_mb.cpp (99%) rename hphp/test/{ => ext}/test_ext_mb.h (98%) rename hphp/test/{ => ext}/test_ext_mcrypt.cpp (99%) rename hphp/test/{ => ext}/test_ext_mcrypt.h (98%) rename hphp/test/{ => ext}/test_ext_memcache.cpp (98%) rename hphp/test/{ => ext}/test_ext_memcache.h (98%) rename hphp/test/{ => ext}/test_ext_memcached.cpp (99%) rename hphp/test/{ => ext}/test_ext_memcached.h (97%) rename hphp/test/{ => ext}/test_ext_misc.cpp (99%) rename hphp/test/{ => ext}/test_ext_misc.h (98%) rename hphp/test/{ => ext}/test_ext_mysql.cpp (99%) rename hphp/test/{ => ext}/test_ext_mysql.h (98%) rename hphp/test/{ => ext}/test_ext_network.cpp (99%) rename hphp/test/{ => ext}/test_ext_network.h (98%) rename hphp/test/{ => ext}/test_ext_openssl.cpp (99%) rename hphp/test/{ => ext}/test_ext_openssl.h (98%) rename hphp/test/{ => ext}/test_ext_options.cpp (99%) rename hphp/test/{ => ext}/test_ext_options.h (98%) rename hphp/test/{ => ext}/test_ext_output.cpp (99%) rename hphp/test/{ => ext}/test_ext_output.h (98%) rename hphp/test/{ => ext}/test_ext_pdo.cpp (98%) rename hphp/test/{ => ext}/test_ext_pdo.h (97%) rename hphp/test/{ => ext}/test_ext_posix.cpp (98%) rename hphp/test/{ => ext}/test_ext_posix.h (98%) rename hphp/test/{ => ext}/test_ext_preg.cpp (99%) rename hphp/test/{ => ext}/test_ext_preg.h (97%) rename hphp/test/{ => ext}/test_ext_process.cpp (98%) rename hphp/test/{ => ext}/test_ext_process.h (98%) rename hphp/test/{ => ext}/test_ext_reflection.cpp (98%) rename hphp/test/{ => ext}/test_ext_reflection.h (97%) rename hphp/test/{ => ext}/test_ext_server.cpp (99%) rename hphp/test/{ => ext}/test_ext_server.h (97%) rename hphp/test/{ => ext}/test_ext_session.cpp (98%) rename hphp/test/{ => ext}/test_ext_session.h (98%) rename hphp/test/{ => ext}/test_ext_simplexml.cpp (98%) rename hphp/test/{ => ext}/test_ext_simplexml.h (97%) rename hphp/test/{ => ext}/test_ext_soap.cpp (99%) rename hphp/test/{ => ext}/test_ext_soap.h (99%) rename hphp/test/{ => ext}/test_ext_socket.cpp (99%) rename hphp/test/{ => ext}/test_ext_socket.h (98%) rename hphp/test/{ => ext}/test_ext_spl.cpp (98%) rename hphp/test/{ => ext}/test_ext_spl.h (97%) rename hphp/test/{ => ext}/test_ext_sqlite3.cpp (99%) rename hphp/test/{ => ext}/test_ext_sqlite3.h (97%) rename hphp/test/{ => ext}/test_ext_stream.cpp (99%) rename hphp/test/{ => ext}/test_ext_stream.h (98%) rename hphp/test/{ => ext}/test_ext_string.cpp (99%) rename hphp/test/{ => ext}/test_ext_string.h (98%) rename hphp/test/{ => ext}/test_ext_thread.cpp (98%) rename hphp/test/{ => ext}/test_ext_thread.h (97%) rename hphp/test/{ => ext}/test_ext_thrift.cpp (97%) rename hphp/test/{ => ext}/test_ext_thrift.h (97%) rename hphp/test/{ => ext}/test_ext_url.cpp (98%) rename hphp/test/{ => ext}/test_ext_url.h (97%) rename hphp/test/{ => ext}/test_ext_variable.cpp (99%) rename hphp/test/{ => ext}/test_ext_variable.h (98%) rename hphp/test/{ => ext}/test_ext_xml.cpp (99%) rename hphp/test/{ => ext}/test_ext_xml.h (98%) rename hphp/test/{ => ext}/test_ext_xmlreader.cpp (97%) rename hphp/test/{ => ext}/test_ext_xmlreader.h (97%) rename hphp/test/{ => ext}/test_ext_xmlwriter.cpp (99%) rename hphp/test/{ => ext}/test_ext_xmlwriter.h (98%) rename hphp/test/{ => ext}/test_ext_zlib.cpp (94%) rename hphp/test/{ => ext}/test_ext_zlib.gz (100%) rename hphp/test/{ => ext}/test_ext_zlib.h (98%) rename hphp/test/{ => ext}/test_get_meta_tags.html (100%) rename hphp/test/{ => ext}/test_logger.cpp (99%) rename hphp/test/{ => ext}/test_logger.h (100%) rename hphp/test/{ => ext}/test_parser.cpp (98%) rename hphp/test/{ => ext}/test_parser.h (98%) rename hphp/test/{ => ext}/test_parser_expr.cpp (99%) rename hphp/test/{ => ext}/test_parser_expr.h (98%) rename hphp/test/{ => ext}/test_parser_stmt.cpp (99%) rename hphp/test/{ => ext}/test_parser_stmt.h (98%) rename hphp/test/{ => ext}/test_server.cpp (99%) rename hphp/test/{ => ext}/test_server.h (99%) rename hphp/test/{ => ext}/test_util.cpp (99%) rename hphp/test/{ => ext}/test_util.h (97%) delete mode 100644 hphp/test/test_base_suite.inc diff --git a/hphp/doc/extension.development b/hphp/doc/extension.development index ac5b40404..8559d32a6 100644 --- a/hphp/doc/extension.development +++ b/hphp/doc/extension.development @@ -37,8 +37,8 @@ This will modify several files with the new signatures. 4. Unit tests The "EXT=name make -C idl update" does the following for test files: - creates test/test_ext_[name].h -- entry points for this unit test, don't modify - updates test/test_ext.inc -- to invoke the test, don't modify + creates test/ext/test_ext_[name].h -- entry points for this unit test, don't modify + updates test/ext/test_ext.inc -- to invoke the test, don't modify creates idl/test_ext_[name].cpp -- A template to be modified. You can probably delete these and modify the existing unit tests. @@ -115,13 +115,13 @@ of them manually. These are the two files that you will add implementation to. 5. Unit tests The "EXT=name make update" does the following for test files: - creates test/test_ext_[name].h -- entry points for this unit test, don't modify - updates test/test_ext.inc -- to invoke the test, don't modify + creates test/ext/test_ext_[name].h -- entry points for this unit test, don't modify + updates test/ext/test_ext.inc -- to invoke the test, don't modify creates idl/test_ext_[name].cpp -- A template to be modified. You will have to add new unit tests to - test/test_ext_[name].cpp + test/ext/test_ext_[name].cpp into both the list of RUN_TEST() at top portion of the file and a real unit test function like this, diff --git a/hphp/test/CMakeLists.txt b/hphp/test/CMakeLists.txt index 2bf08afe7..6e945952b 100644 --- a/hphp/test/CMakeLists.txt +++ b/hphp/test/CMakeLists.txt @@ -14,7 +14,6 @@ list(APPEND CXX_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../hhvm/global_variables.cp add_definitions(-DHPHPI_PATH="hphpi/hphpi") -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test_base_suite.inc ${CMAKE_CURRENT_SOURCE_DIR}/test_suite.inc COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dummy_mysql_info.inc ${CMAKE_CURRENT_SOURCE_DIR}/test_mysql_info.inc COPYONLY) add_executable(test ${CXX_SOURCES}) diff --git a/hphp/test/main.cpp b/hphp/test/ext/main.cpp similarity index 98% rename from hphp/test/main.cpp rename to hphp/test/ext/main.cpp index fbe5efec8..9e2792f70 100644 --- a/hphp/test/main.cpp +++ b/hphp/test/ext/main.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test.h" +#include "hphp/test/ext/test.h" #include "hphp/util/logger.h" #include "hphp/runtime/base/program_functions.h" #include diff --git a/hphp/test/test.cpp b/hphp/test/ext/test.cpp similarity index 99% rename from hphp/test/test.cpp rename to hphp/test/ext/test.cpp index 37522adc4..4fdc3c4c3 100644 --- a/hphp/test/test.cpp +++ b/hphp/test/ext/test.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test.h" +#include "hphp/test/ext/test.h" #include "hphp/runtime/base/shared/shared_store_base.h" #include "hphp/compiler/option.h" diff --git a/hphp/test/test.h b/hphp/test/ext/test.h similarity index 99% rename from hphp/test/test.h rename to hphp/test/ext/test.h index a8f792739..73168ca42 100644 --- a/hphp/test/test.h +++ b/hphp/test/ext/test.h @@ -18,7 +18,7 @@ #define incl_HPHP_TEST_H_ #include "hphp/compiler/hphp.h" -#include "hphp/test/test_logger.h" +#include "hphp/test/ext/test_logger.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_all.cpp b/hphp/test/ext/test_all.cpp similarity index 83% rename from hphp/test/test_all.cpp rename to hphp/test/ext/test_all.cpp index 3e997122f..2551700db 100644 --- a/hphp/test/test_all.cpp +++ b/hphp/test/ext/test_all.cpp @@ -14,8 +14,15 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test.h" -#include +#include "hphp/test/ext/test.h" +#include "hphp/test/ext/test_parser_expr.h" +#include "hphp/test/ext/test_parser_stmt.h" +#include "hphp/test/ext/test_code_error.h" +#include "hphp/test/ext/test_cpp_base.h" +#include "hphp/test/ext/test_util.h" +#include "hphp/test/ext/test_ext.h" +#include "hphp/test/ext/test_server.h" +#include "hphp/test/ext/test_debugger.h" #include "hphp/compiler/option.h" /////////////////////////////////////////////////////////////////////////////// @@ -51,7 +58,7 @@ void Test::RunTestsImpl(bool &allPassed, std::string &suite, } if (set == "TestExt") { // complete extension tests -#include "hphp/test/test_ext.inc" +#include "hphp/test/ext/test_ext.inc" return; } diff --git a/hphp/test/test_base.cpp b/hphp/test/ext/test_base.cpp similarity index 97% rename from hphp/test/test_base.cpp rename to hphp/test/ext/test_base.cpp index 8edef90ea..be9bfb78c 100644 --- a/hphp/test/test_base.cpp +++ b/hphp/test/ext/test_base.cpp @@ -14,10 +14,10 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_base.h" +#include "hphp/test/ext/test_base.h" #include #include "hphp/compiler/option.h" -#include "hphp/test/test.h" +#include "hphp/test/ext/test.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/ext/ext_variable.h" #include "hphp/runtime/ext/ext_array.h" diff --git a/hphp/test/test_base.h b/hphp/test/ext/test_base.h similarity index 99% rename from hphp/test/test_base.h rename to hphp/test/ext/test_base.h index 45d750075..5a5cf2bb1 100644 --- a/hphp/test/test_base.h +++ b/hphp/test/ext/test_base.h @@ -21,7 +21,7 @@ #include #include "hphp/compiler/hphp.h" #include "hphp/runtime/base/types.h" -#include "hphp/test/test.h" +#include "hphp/test/ext/test.h" using namespace HPHP; /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_code_error.cpp b/hphp/test/ext/test_code_error.cpp similarity index 99% rename from hphp/test/test_code_error.cpp rename to hphp/test/ext/test_code_error.cpp index cec5c7cb9..faedd9042 100644 --- a/hphp/test/test_code_error.cpp +++ b/hphp/test/ext/test_code_error.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_code_error.h" +#include "hphp/test/ext/test_code_error.h" #include "hphp/compiler/parser/parser.h" #include "hphp/compiler/builtin_symbols.h" #include "hphp/compiler/analysis/analysis_result.h" @@ -30,7 +30,7 @@ TestCodeError::TestCodeError() { bool TestCodeError::RunTests(const std::string &which) { bool ret = true; #define CODE_ERROR_ENTRY(x) RUN_TEST(Test ## x); -#include "../compiler/analysis/core_code_error.inc" +#include "hphp/compiler/analysis/core_code_error.inc" #undef CODE_ERROR_ENTRY return ret; } diff --git a/hphp/test/test_code_error.h b/hphp/test/ext/test_code_error.h similarity index 95% rename from hphp/test/test_code_error.h rename to hphp/test/ext/test_code_error.h index 9a9d515d8..b8a0596e1 100644 --- a/hphp/test/test_code_error.h +++ b/hphp/test/ext/test_code_error.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_TEST_CODE_ERROR_H_ #define incl_HPHP_TEST_CODE_ERROR_H_ -#include "hphp/test/test_base.h" +#include "hphp/test/ext/test_base.h" #include "hphp/compiler/analysis/code_error.h" /////////////////////////////////////////////////////////////////////////////// @@ -29,7 +29,7 @@ class TestCodeError : public TestBase { virtual bool RunTests(const std::string &which); #define CODE_ERROR_ENTRY(x) bool Test ## x(); -#include "../compiler/analysis/core_code_error.inc" +#include "hphp/compiler/analysis/core_code_error.inc" #undef CODE_ERROR_ENTRY private: diff --git a/hphp/test/test_code_run.cpp b/hphp/test/ext/test_code_run.cpp similarity index 99% rename from hphp/test/test_code_run.cpp rename to hphp/test/ext/test_code_run.cpp index 5f9d5a28a..0b1eaf838 100644 --- a/hphp/test/test_code_run.cpp +++ b/hphp/test/ext/test_code_run.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_code_run.h" +#include "hphp/test/ext/test_code_run.h" #include "hphp/compiler/parser/parser.h" #include "hphp/compiler/builtin_symbols.h" #include "hphp/compiler/code_generator.h" @@ -25,7 +25,7 @@ #include "hphp/compiler/option.h" #include "hphp/runtime/base/runtime_option.h" #include -#include "hphp/test/test_mysql_info.h" +#include "hphp/test/ext/test_mysql_info.h" #include "hphp/runtime/ext/ext_file.h" using std::istringstream; diff --git a/hphp/test/test_code_run.h b/hphp/test/ext/test_code_run.h similarity index 98% rename from hphp/test/test_code_run.h rename to hphp/test/ext/test_code_run.h index 45059d42f..59ea3d2e1 100644 --- a/hphp/test/test_code_run.h +++ b/hphp/test/ext/test_code_run.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_TEST_CODE_RUN_H_ #define incl_HPHP_TEST_CODE_RUN_H_ -#include "hphp/test/test_base.h" +#include "hphp/test/ext/test_base.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_cpp_base.cpp b/hphp/test/ext/test_cpp_base.cpp similarity index 99% rename from hphp/test/test_cpp_base.cpp rename to hphp/test/ext/test_cpp_base.cpp index 864b11628..46170e625 100644 --- a/hphp/test/test_cpp_base.cpp +++ b/hphp/test/ext/test_cpp_base.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_cpp_base.h" +#include "hphp/test/ext/test_cpp_base.h" #include "hphp/runtime/base/base_includes.h" #include "hphp/util/logger.h" #include "hphp/runtime/base/memory/memory_manager.h" @@ -26,7 +26,7 @@ #include "hphp/runtime/base/shared/shared_store_base.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/server/ip_block_map.h" -#include "hphp/test/test_mysql_info.h" +#include "hphp/test/ext/test_mysql_info.h" #include "hphp/system/lib/systemlib.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_cpp_base.h b/hphp/test/ext/test_cpp_base.h similarity index 98% rename from hphp/test/test_cpp_base.h rename to hphp/test/ext/test_cpp_base.h index fd12cde74..6ea061493 100644 --- a/hphp/test/test_cpp_base.h +++ b/hphp/test/ext/test_cpp_base.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_TEST_CPP_BASE_H_ #define incl_HPHP_TEST_CPP_BASE_H_ -#include "hphp/test/test_base.h" +#include "hphp/test/ext/test_base.h" #include "hphp/util/base.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_cpp_ext.cpp b/hphp/test/ext/test_cpp_ext.cpp similarity index 96% rename from hphp/test/test_cpp_ext.cpp rename to hphp/test/ext/test_cpp_ext.cpp index 08382a7b6..e79b0cb18 100644 --- a/hphp/test/test_cpp_ext.cpp +++ b/hphp/test/ext/test_cpp_ext.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_cpp_ext.h b/hphp/test/ext/test_cpp_ext.h similarity index 98% rename from hphp/test/test_cpp_ext.h rename to hphp/test/ext/test_cpp_ext.h index 0376263d0..eb4b5f630 100644 --- a/hphp/test/test_cpp_ext.h +++ b/hphp/test/ext/test_cpp_ext.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_TEST_CPP_EXT_H_ #define incl_HPHP_TEST_CPP_EXT_H_ -#include "hphp/test/test_cpp_base.h" +#include "hphp/test/ext/test_cpp_base.h" #include "hphp/runtime/ext/ext_variable.h" // we frequently need to call f_var_dump() #include "hphp/runtime/base/program_functions.h" #include "hphp/runtime/ext/ext_misc.h" diff --git a/hphp/test/test_debugger.cpp b/hphp/test/ext/test_debugger.cpp similarity index 99% rename from hphp/test/test_debugger.cpp rename to hphp/test/ext/test_debugger.cpp index deccdd8a1..06c69cfc1 100644 --- a/hphp/test/test_debugger.cpp +++ b/hphp/test/ext/test_debugger.cpp @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_debugger.h" -#include "hphp/test/test_server.h" +#include "hphp/test/ext/test_debugger.h" +#include "hphp/test/ext/test_server.h" #include "hphp/runtime/ext/ext_curl.h" #include "hphp/runtime/ext/ext_file.h" #include "hphp/runtime/ext/ext_preg.h" diff --git a/hphp/test/test_debugger.h b/hphp/test/ext/test_debugger.h similarity index 98% rename from hphp/test/test_debugger.h rename to hphp/test/ext/test_debugger.h index 23e52a415..10018b418 100644 --- a/hphp/test/test_debugger.h +++ b/hphp/test/ext/test_debugger.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_TEST_DEBUGGER_H_ #define incl_HPHP_TEST_DEBUGGER_H_ -#include "hphp/test/test_base.h" +#include "hphp/test/ext/test_base.h" #include "hphp/runtime/base/complex_types.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/ext/test_ext.h b/hphp/test/ext/test_ext.h new file mode 100644 index 000000000..1a993adb8 --- /dev/null +++ b/hphp/test/ext/test_ext.h @@ -0,0 +1,106 @@ +/* + +----------------------------------------------------------------------+ + | HipHop for PHP | + +----------------------------------------------------------------------+ + | Copyright (c) 2010- Facebook, Inc. (http://www.facebook.com) | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ +*/ + +/* Generated by idl_list.php. Do NOT modify. */ + +#ifndef incl_EXT_LIST_TEST_EXT_H_ +#define incl_EXT_LIST_TEST_EXT_H_ + +#include "hphp/facebook/extensions/facebook/test_ext_facebook.h" +#include "hphp/facebook/extensions/fbml/test_ext_fbml.h" +#include "hphp/facebook/extensions/fdb/test_ext_fdb.h" +#include "hphp/facebook/extensions/gameskill/test_ext_gameskill.h" +#include "hphp/facebook/extensions/gatehouse/test_ext_gatehouse.h" +#include "hphp/facebook/extensions/obc/test_ext_obc.h" +#include "hphp/facebook/extensions/oracle/test_ext_oracle.h" +#include "hphp/facebook/extensions/photodna/test_ext_photodna.h" +#include "hphp/facebook/extensions/php_mcc/test_ext_php_mcc.h" +#include "hphp/facebook/extensions/phpmc/test_ext_phpmc.h" +#include "hphp/facebook/extensions/scrypt/test_ext_scrypt.h" +#include "hphp/facebook/extensions/servicerouter/test_ext_servicerouter.h" +#include "hphp/facebook/extensions/string_buffer/test_ext_string_buffer.h" +#include "hphp/facebook/extensions/tao/test_ext_tao.h" +#include "hphp/facebook/extensions/urlextraction/test_ext_urlextraction.h" +#include "hphp/test/ext/test_ext_apache.h" +#include "hphp/test/ext/test_ext_apc.h" +#include "hphp/test/ext/test_ext_apd.h" +#include "hphp/test/ext/test_ext_array.h" +#include "hphp/test/ext/test_ext_asio.h" +#include "hphp/test/ext/test_ext_bcmath.h" +#include "hphp/test/ext/test_ext_bzip2.h" +#include "hphp/test/ext/test_ext_class.h" +#include "hphp/test/ext/test_ext_closure.h" +#include "hphp/test/ext/test_ext_collections.h" +#include "hphp/test/ext/test_ext_continuation.h" +#include "hphp/test/ext/test_ext_ctype.h" +#include "hphp/test/ext/test_ext_curl.h" +#include "hphp/test/ext/test_ext_datetime.h" +#include "hphp/test/ext/test_ext_debugger.h" +#include "hphp/test/ext/test_ext_domdocument.h" +#include "hphp/test/ext/test_ext_error.h" +#include "hphp/test/ext/test_ext_fb.h" +#include "hphp/test/ext/test_ext_file.h" +#include "hphp/test/ext/test_ext_function.h" +#include "hphp/test/ext/test_ext_hash.h" +#include "hphp/test/ext/test_ext_iconv.h" +#include "hphp/test/ext/test_ext_icu.h" +#include "hphp/test/ext/test_ext_icu_ucnv.h" +#include "hphp/test/ext/test_ext_icu_ucsdet.h" +#include "hphp/test/ext/test_ext_icu_uspoof.h" +#include "hphp/test/ext/test_ext_image.h" +#include "hphp/test/ext/test_ext_imagesprite.h" +#include "hphp/test/ext/test_ext_imap.h" +#include "hphp/test/ext/test_ext_intl.h" +#include "hphp/test/ext/test_ext_ipc.h" +#include "hphp/test/ext/test_ext_json.h" +#include "hphp/test/ext/test_ext_ldap.h" +#include "hphp/test/ext/test_ext_magick.h" +#include "hphp/test/ext/test_ext_mailparse.h" +#include "hphp/test/ext/test_ext_math.h" +#include "hphp/test/ext/test_ext_mb.h" +#include "hphp/test/ext/test_ext_mcrypt.h" +#include "hphp/test/ext/test_ext_memcache.h" +#include "hphp/test/ext/test_ext_memcached.h" +#include "hphp/test/ext/test_ext_misc.h" +#include "hphp/test/ext/test_ext_mysql.h" +#include "hphp/test/ext/test_ext_network.h" +#include "hphp/test/ext/test_ext_openssl.h" +#include "hphp/test/ext/test_ext_options.h" +#include "hphp/test/ext/test_ext_output.h" +#include "hphp/test/ext/test_ext_pdo.h" +#include "hphp/test/ext/test_ext_posix.h" +#include "hphp/test/ext/test_ext_preg.h" +#include "hphp/test/ext/test_ext_process.h" +#include "hphp/test/ext/test_ext_reflection.h" +#include "hphp/test/ext/test_ext_server.h" +#include "hphp/test/ext/test_ext_session.h" +#include "hphp/test/ext/test_ext_simplexml.h" +#include "hphp/test/ext/test_ext_soap.h" +#include "hphp/test/ext/test_ext_socket.h" +#include "hphp/test/ext/test_ext_spl.h" +#include "hphp/test/ext/test_ext_sqlite3.h" +#include "hphp/test/ext/test_ext_stream.h" +#include "hphp/test/ext/test_ext_string.h" +#include "hphp/test/ext/test_ext_thread.h" +#include "hphp/test/ext/test_ext_thrift.h" +#include "hphp/test/ext/test_ext_url.h" +#include "hphp/test/ext/test_ext_variable.h" +#include "hphp/test/ext/test_ext_xml.h" +#include "hphp/test/ext/test_ext_xmlreader.h" +#include "hphp/test/ext/test_ext_xmlwriter.h" +#include "hphp/test/ext/test_ext_zlib.h" + +#endif // incl_EXT_LIST_TEST_EXT_H_ diff --git a/hphp/test/test_ext_apache.cpp b/hphp/test/ext/test_ext_apache.cpp similarity index 98% rename from hphp/test/test_ext_apache.cpp rename to hphp/test/ext/test_ext_apache.cpp index 7def266c2..6d6e5d75b 100644 --- a/hphp/test/test_ext_apache.cpp +++ b/hphp/test/ext/test_ext_apache.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_apache.h" +#include "hphp/test/ext/test_ext_apache.h" #include "hphp/runtime/ext/ext_apache.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_apache.h b/hphp/test/ext/test_ext_apache.h similarity index 98% rename from hphp/test/test_ext_apache.h rename to hphp/test/ext/test_ext_apache.h index 7878d7e94..298237579 100644 --- a/hphp/test/test_ext_apache.h +++ b/hphp/test/ext/test_ext_apache.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_apc.cpp b/hphp/test/ext/test_ext_apc.cpp similarity index 99% rename from hphp/test/test_ext_apc.cpp rename to hphp/test/ext/test_ext_apc.cpp index e5f8c0435..6a789e338 100644 --- a/hphp/test/test_ext_apc.cpp +++ b/hphp/test/ext/test_ext_apc.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_apc.h" +#include "hphp/test/ext/test_ext_apc.h" #include "hphp/runtime/ext/ext_apc.h" #include "hphp/runtime/ext/ext_options.h" #include "hphp/runtime/base/shared/shared_store_base.h" diff --git a/hphp/test/test_ext_apc.h b/hphp/test/ext/test_ext_apc.h similarity index 98% rename from hphp/test/test_ext_apc.h rename to hphp/test/ext/test_ext_apc.h index e52953a50..7da173227 100644 --- a/hphp/test/test_ext_apc.h +++ b/hphp/test/ext/test_ext_apc.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_apd.cpp b/hphp/test/ext/test_ext_apd.cpp similarity index 98% rename from hphp/test/test_ext_apd.cpp rename to hphp/test/ext/test_ext_apd.cpp index 232ca899d..f2d8401b8 100644 --- a/hphp/test/test_ext_apd.cpp +++ b/hphp/test/ext/test_ext_apd.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_apd.h" +#include "hphp/test/ext/test_ext_apd.h" #include "hphp/runtime/ext/ext_apd.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_apd.h b/hphp/test/ext/test_ext_apd.h similarity index 97% rename from hphp/test/test_ext_apd.h rename to hphp/test/ext/test_ext_apd.h index 1b6e9cb34..d3b4ca308 100644 --- a/hphp/test/test_ext_apd.h +++ b/hphp/test/ext/test_ext_apd.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_array.cpp b/hphp/test/ext/test_ext_array.cpp similarity index 99% rename from hphp/test/test_ext_array.cpp rename to hphp/test/ext/test_ext_array.cpp index 2d9b8cabe..d4102ee0b 100644 --- a/hphp/test/test_ext_array.cpp +++ b/hphp/test/ext/test_ext_array.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_array.h" +#include "hphp/test/ext/test_ext_array.h" #include "hphp/runtime/ext/ext_variable.h" #include "hphp/runtime/ext/ext_array.h" #include "hphp/runtime/ext/ext_math.h" diff --git a/hphp/test/test_ext_array.h b/hphp/test/ext/test_ext_array.h similarity index 98% rename from hphp/test/test_ext_array.h rename to hphp/test/ext/test_ext_array.h index b0d0a6ac6..a2f7421a7 100644 --- a/hphp/test/test_ext_array.h +++ b/hphp/test/ext/test_ext_array.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_asio.cpp b/hphp/test/ext/test_ext_asio.cpp similarity index 98% rename from hphp/test/test_ext_asio.cpp rename to hphp/test/ext/test_ext_asio.cpp index 1f20c1201..fa2a76072 100644 --- a/hphp/test/test_ext_asio.cpp +++ b/hphp/test/ext/test_ext_asio.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_asio.h" +#include "hphp/test/ext/test_ext_asio.h" #include "hphp/runtime/ext/ext_asio.h" IMPLEMENT_SEP_EXTENSION_TEST(Asio); diff --git a/hphp/test/test_ext_asio.h b/hphp/test/ext/test_ext_asio.h similarity index 97% rename from hphp/test/test_ext_asio.h rename to hphp/test/ext/test_ext_asio.h index 318c62fb2..b7bab6a5b 100644 --- a/hphp/test/test_ext_asio.h +++ b/hphp/test/ext/test_ext_asio.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_bcmath.cpp b/hphp/test/ext/test_ext_bcmath.cpp similarity index 98% rename from hphp/test/test_ext_bcmath.cpp rename to hphp/test/ext/test_ext_bcmath.cpp index 0f53f81f0..2fd09ccc5 100644 --- a/hphp/test/test_ext_bcmath.cpp +++ b/hphp/test/ext/test_ext_bcmath.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_bcmath.h" +#include "hphp/test/ext/test_ext_bcmath.h" #include "hphp/runtime/ext/ext_bcmath.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_bcmath.h b/hphp/test/ext/test_ext_bcmath.h similarity index 97% rename from hphp/test/test_ext_bcmath.h rename to hphp/test/ext/test_ext_bcmath.h index 4f9696c2c..44e278b07 100644 --- a/hphp/test/test_ext_bcmath.h +++ b/hphp/test/ext/test_ext_bcmath.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_bzip2.cpp b/hphp/test/ext/test_ext_bzip2.cpp similarity index 98% rename from hphp/test/test_ext_bzip2.cpp rename to hphp/test/ext/test_ext_bzip2.cpp index b7ade60ab..c779f2392 100644 --- a/hphp/test/test_ext_bzip2.cpp +++ b/hphp/test/ext/test_ext_bzip2.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_bzip2.h" +#include "hphp/test/ext/test_ext_bzip2.h" #include "hphp/runtime/ext/ext_bzip2.h" IMPLEMENT_SEP_EXTENSION_TEST(Bzip2); diff --git a/hphp/test/test_ext_bzip2.h b/hphp/test/ext/test_ext_bzip2.h similarity index 97% rename from hphp/test/test_ext_bzip2.h rename to hphp/test/ext/test_ext_bzip2.h index bbd533957..07e2917f1 100644 --- a/hphp/test/test_ext_bzip2.h +++ b/hphp/test/ext/test_ext_bzip2.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_class.cpp b/hphp/test/ext/test_ext_class.cpp similarity index 99% rename from hphp/test/test_ext_class.cpp rename to hphp/test/ext/test_ext_class.cpp index b504488ad..e56564967 100644 --- a/hphp/test/test_ext_class.cpp +++ b/hphp/test/ext/test_ext_class.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_class.h" +#include "hphp/test/ext/test_ext_class.h" #include "hphp/runtime/ext/ext_class.h" #include "hphp/runtime/ext/ext_array.h" diff --git a/hphp/test/test_ext_class.h b/hphp/test/ext/test_ext_class.h similarity index 97% rename from hphp/test/test_ext_class.h rename to hphp/test/ext/test_ext_class.h index 8f8d31ace..f7333b431 100644 --- a/hphp/test/test_ext_class.h +++ b/hphp/test/ext/test_ext_class.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_closure.cpp b/hphp/test/ext/test_ext_closure.cpp similarity index 96% rename from hphp/test/test_ext_closure.cpp rename to hphp/test/ext/test_ext_closure.cpp index 0e0ebf415..78bd2d8dd 100644 --- a/hphp/test/test_ext_closure.cpp +++ b/hphp/test/ext/test_ext_closure.cpp @@ -13,7 +13,7 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_closure.h" +#include "hphp/test/ext/test_ext_closure.h" #include "hphp/runtime/ext/ext_closure.h" IMPLEMENT_SEP_EXTENSION_TEST(Closure); diff --git a/hphp/test/test_ext_closure.h b/hphp/test/ext/test_ext_closure.h similarity index 97% rename from hphp/test/test_ext_closure.h rename to hphp/test/ext/test_ext_closure.h index f668c5345..bcfff4bcc 100644 --- a/hphp/test/test_ext_closure.h +++ b/hphp/test/ext/test_ext_closure.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_collections.cpp b/hphp/test/ext/test_ext_collections.cpp similarity index 96% rename from hphp/test/test_ext_collections.cpp rename to hphp/test/ext/test_ext_collections.cpp index 2120b9a1e..dc2e4911e 100644 --- a/hphp/test/test_ext_collections.cpp +++ b/hphp/test/ext/test_ext_collections.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_collections.h" +#include "hphp/test/ext/test_ext_collections.h" #include "hphp/runtime/ext/ext_collections.h" IMPLEMENT_SEP_EXTENSION_TEST(Collection); diff --git a/hphp/test/test_ext_collections.h b/hphp/test/ext/test_ext_collections.h similarity index 97% rename from hphp/test/test_ext_collections.h rename to hphp/test/ext/test_ext_collections.h index fe010f3e0..137126ed4 100644 --- a/hphp/test/test_ext_collections.h +++ b/hphp/test/ext/test_ext_collections.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_continuation.cpp b/hphp/test/ext/test_ext_continuation.cpp similarity index 96% rename from hphp/test/test_ext_continuation.cpp rename to hphp/test/ext/test_ext_continuation.cpp index dbf15ede2..fa89701d2 100644 --- a/hphp/test/test_ext_continuation.cpp +++ b/hphp/test/ext/test_ext_continuation.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_continuation.h" +#include "hphp/test/ext/test_ext_continuation.h" #include "hphp/runtime/ext/ext_continuation.h" IMPLEMENT_SEP_EXTENSION_TEST(Continuation); diff --git a/hphp/test/test_ext_continuation.h b/hphp/test/ext/test_ext_continuation.h similarity index 97% rename from hphp/test/test_ext_continuation.h rename to hphp/test/ext/test_ext_continuation.h index 8b15c7449..fc2d27748 100644 --- a/hphp/test/test_ext_continuation.h +++ b/hphp/test/ext/test_ext_continuation.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_ctype.cpp b/hphp/test/ext/test_ext_ctype.cpp similarity index 98% rename from hphp/test/test_ext_ctype.cpp rename to hphp/test/ext/test_ext_ctype.cpp index 94a43d9cb..f7ae0a364 100644 --- a/hphp/test/test_ext_ctype.cpp +++ b/hphp/test/ext/test_ext_ctype.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_ctype.h" +#include "hphp/test/ext/test_ext_ctype.h" #include "hphp/runtime/ext/ext_ctype.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_ctype.h b/hphp/test/ext/test_ext_ctype.h similarity index 97% rename from hphp/test/test_ext_ctype.h rename to hphp/test/ext/test_ext_ctype.h index 75b0b504a..72810e97d 100644 --- a/hphp/test/test_ext_ctype.h +++ b/hphp/test/ext/test_ext_ctype.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_curl.cpp b/hphp/test/ext/test_ext_curl.cpp similarity index 99% rename from hphp/test/test_ext_curl.cpp rename to hphp/test/ext/test_ext_curl.cpp index 792840f12..f8bee7275 100644 --- a/hphp/test/test_ext_curl.cpp +++ b/hphp/test/ext/test_ext_curl.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_curl.h" +#include "hphp/test/ext/test_ext_curl.h" #include "hphp/runtime/ext/ext_curl.h" #include "hphp/runtime/ext/ext_output.h" #include "hphp/runtime/ext/ext_zlib.h" diff --git a/hphp/test/test_ext_curl.h b/hphp/test/ext/test_ext_curl.h similarity index 98% rename from hphp/test/test_ext_curl.h rename to hphp/test/ext/test_ext_curl.h index 5ac804987..1fe1c00b9 100644 --- a/hphp/test/test_ext_curl.h +++ b/hphp/test/ext/test_ext_curl.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_datetime.cpp b/hphp/test/ext/test_ext_datetime.cpp similarity index 99% rename from hphp/test/test_ext_datetime.cpp rename to hphp/test/ext/test_ext_datetime.cpp index cca460372..6c9341878 100644 --- a/hphp/test/test_ext_datetime.cpp +++ b/hphp/test/ext/test_ext_datetime.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_datetime.h" +#include "hphp/test/ext/test_ext_datetime.h" #include "hphp/runtime/ext/ext_datetime.h" #include "hphp/runtime/ext/ext_string.h" diff --git a/hphp/test/test_ext_datetime.h b/hphp/test/ext/test_ext_datetime.h similarity index 98% rename from hphp/test/test_ext_datetime.h rename to hphp/test/ext/test_ext_datetime.h index 3e7f001f3..73e7b4908 100644 --- a/hphp/test/test_ext_datetime.h +++ b/hphp/test/ext/test_ext_datetime.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_debugger.cpp b/hphp/test/ext/test_ext_debugger.cpp similarity index 97% rename from hphp/test/test_ext_debugger.cpp rename to hphp/test/ext/test_ext_debugger.cpp index f38e36aaa..dc6df11e8 100644 --- a/hphp/test/test_ext_debugger.cpp +++ b/hphp/test/ext/test_ext_debugger.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_debugger.h" +#include "hphp/test/ext/test_ext_debugger.h" #include "hphp/runtime/ext/ext_debugger.h" IMPLEMENT_SEP_EXTENSION_TEST(Debugger); diff --git a/hphp/test/test_ext_debugger.h b/hphp/test/ext/test_ext_debugger.h similarity index 97% rename from hphp/test/test_ext_debugger.h rename to hphp/test/ext/test_ext_debugger.h index 6e8467456..16c34c912 100644 --- a/hphp/test/test_ext_debugger.h +++ b/hphp/test/ext/test_ext_debugger.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_domdocument.cpp b/hphp/test/ext/test_ext_domdocument.cpp similarity index 98% rename from hphp/test/test_ext_domdocument.cpp rename to hphp/test/ext/test_ext_domdocument.cpp index 3bb40eb35..1c2e209ad 100644 --- a/hphp/test/test_ext_domdocument.cpp +++ b/hphp/test/ext/test_ext_domdocument.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_domdocument.h" +#include "hphp/test/ext/test_ext_domdocument.h" #include "hphp/runtime/ext/ext_domdocument.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_domdocument.h b/hphp/test/ext/test_ext_domdocument.h similarity index 98% rename from hphp/test/test_ext_domdocument.h rename to hphp/test/ext/test_ext_domdocument.h index 2baf0c80c..2b6093634 100644 --- a/hphp/test/test_ext_domdocument.h +++ b/hphp/test/ext/test_ext_domdocument.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_error.cpp b/hphp/test/ext/test_ext_error.cpp similarity index 98% rename from hphp/test/test_ext_error.cpp rename to hphp/test/ext/test_ext_error.cpp index 4253089a2..a267d0fd2 100644 --- a/hphp/test/test_ext_error.cpp +++ b/hphp/test/ext/test_ext_error.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_error.h" +#include "hphp/test/ext/test_ext_error.h" #include "hphp/runtime/ext/ext_error.h" #include "hphp/runtime/base/runtime_option.h" diff --git a/hphp/test/test_ext_error.h b/hphp/test/ext/test_ext_error.h similarity index 97% rename from hphp/test/test_ext_error.h rename to hphp/test/ext/test_ext_error.h index 3ccce1d72..ffd749712 100644 --- a/hphp/test/test_ext_error.h +++ b/hphp/test/ext/test_ext_error.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_fb.cpp b/hphp/test/ext/test_ext_fb.cpp similarity index 99% rename from hphp/test/test_ext_fb.cpp rename to hphp/test/ext/test_ext_fb.cpp index 77d21875b..4e9ccb25a 100644 --- a/hphp/test/test_ext_fb.cpp +++ b/hphp/test/ext/test_ext_fb.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_fb.h" +#include "hphp/test/ext/test_ext_fb.h" #include "hphp/runtime/ext/ext_fb.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/ext/ext_iconv.h" diff --git a/hphp/test/test_ext_fb.h b/hphp/test/ext/test_ext_fb.h similarity index 97% rename from hphp/test/test_ext_fb.h rename to hphp/test/ext/test_ext_fb.h index 9c73fa973..63cd6ed20 100644 --- a/hphp/test/test_ext_fb.h +++ b/hphp/test/ext/test_ext_fb.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_file.cpp b/hphp/test/ext/test_ext_file.cpp similarity index 99% rename from hphp/test/test_ext_file.cpp rename to hphp/test/ext/test_ext_file.cpp index e20c75555..132727f1e 100644 --- a/hphp/test/test_ext_file.cpp +++ b/hphp/test/ext/test_ext_file.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_file.h" +#include "hphp/test/ext/test_ext_file.h" #include "hphp/runtime/ext/ext_file.h" #include "hphp/runtime/ext/ext_output.h" #include "hphp/runtime/ext/ext_string.h" diff --git a/hphp/test/test_ext_file.h b/hphp/test/ext/test_ext_file.h similarity index 98% rename from hphp/test/test_ext_file.h rename to hphp/test/ext/test_ext_file.h index bf8a709bc..3dede0469 100644 --- a/hphp/test/test_ext_file.h +++ b/hphp/test/ext/test_ext_file.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_function.cpp b/hphp/test/ext/test_ext_function.cpp similarity index 98% rename from hphp/test/test_ext_function.cpp rename to hphp/test/ext/test_ext_function.cpp index ad5bdf0d8..35b4c7a93 100644 --- a/hphp/test/test_ext_function.cpp +++ b/hphp/test/ext/test_ext_function.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_function.h" +#include "hphp/test/ext/test_ext_function.h" #include "hphp/runtime/ext/ext_function.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_function.h b/hphp/test/ext/test_ext_function.h similarity index 98% rename from hphp/test/test_ext_function.h rename to hphp/test/ext/test_ext_function.h index 6a3a4671d..1b9f706dd 100644 --- a/hphp/test/test_ext_function.h +++ b/hphp/test/ext/test_ext_function.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_hash.cpp b/hphp/test/ext/test_ext_hash.cpp similarity index 99% rename from hphp/test/test_ext_hash.cpp rename to hphp/test/ext/test_ext_hash.cpp index 1c5574499..c03b555d8 100644 --- a/hphp/test/test_ext_hash.cpp +++ b/hphp/test/ext/test_ext_hash.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_hash.h" +#include "hphp/test/ext/test_ext_hash.h" #include "hphp/runtime/ext/ext_hash.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_hash.h b/hphp/test/ext/test_ext_hash.h similarity index 97% rename from hphp/test/test_ext_hash.h rename to hphp/test/ext/test_ext_hash.h index 16f7cb94f..b341ea1ee 100644 --- a/hphp/test/test_ext_hash.h +++ b/hphp/test/ext/test_ext_hash.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_iconv.cpp b/hphp/test/ext/test_ext_iconv.cpp similarity index 99% rename from hphp/test/test_ext_iconv.cpp rename to hphp/test/ext/test_ext_iconv.cpp index 954e0790f..218874302 100644 --- a/hphp/test/test_ext_iconv.cpp +++ b/hphp/test/ext/test_ext_iconv.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_iconv.h" +#include "hphp/test/ext/test_ext_iconv.h" #include "hphp/runtime/ext/ext_iconv.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_iconv.h b/hphp/test/ext/test_ext_iconv.h similarity index 97% rename from hphp/test/test_ext_iconv.h rename to hphp/test/ext/test_ext_iconv.h index 9e13015c7..fceb71375 100644 --- a/hphp/test/test_ext_iconv.h +++ b/hphp/test/ext/test_ext_iconv.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_icu.cpp b/hphp/test/ext/test_ext_icu.cpp similarity index 99% rename from hphp/test/test_ext_icu.cpp rename to hphp/test/ext/test_ext_icu.cpp index 8b2f11aac..2f95f50ca 100644 --- a/hphp/test/test_ext_icu.cpp +++ b/hphp/test/ext/test_ext_icu.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_icu.h" +#include "hphp/test/ext/test_ext_icu.h" #include "hphp/runtime/ext/ext_icu.h" #include diff --git a/hphp/test/test_ext_icu.h b/hphp/test/ext/test_ext_icu.h similarity index 97% rename from hphp/test/test_ext_icu.h rename to hphp/test/ext/test_ext_icu.h index 791fa0256..ad8e5fefc 100644 --- a/hphp/test/test_ext_icu.h +++ b/hphp/test/ext/test_ext_icu.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_icu_ucnv.cpp b/hphp/test/ext/test_ext_icu_ucnv.cpp similarity index 97% rename from hphp/test/test_ext_icu_ucnv.cpp rename to hphp/test/ext/test_ext_icu_ucnv.cpp index cac4018c5..3a1e4a1cc 100644 --- a/hphp/test/test_ext_icu_ucnv.cpp +++ b/hphp/test/ext/test_ext_icu_ucnv.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_icu_ucnv.h" +#include "hphp/test/ext/test_ext_icu_ucnv.h" #include "hphp/runtime/ext/ext_icu_ucnv.h" IMPLEMENT_SEP_EXTENSION_TEST(Icu_ucnv); diff --git a/hphp/test/test_ext_icu_ucnv.h b/hphp/test/ext/test_ext_icu_ucnv.h similarity index 97% rename from hphp/test/test_ext_icu_ucnv.h rename to hphp/test/ext/test_ext_icu_ucnv.h index 3e8b2d4a4..c6b705248 100644 --- a/hphp/test/test_ext_icu_ucnv.h +++ b/hphp/test/ext/test_ext_icu_ucnv.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_icu_ucsdet.cpp b/hphp/test/ext/test_ext_icu_ucsdet.cpp similarity index 99% rename from hphp/test/test_ext_icu_ucsdet.cpp rename to hphp/test/ext/test_ext_icu_ucsdet.cpp index 450073736..e4308acbd 100644 --- a/hphp/test/test_ext_icu_ucsdet.cpp +++ b/hphp/test/ext/test_ext_icu_ucsdet.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_icu_ucsdet.h" +#include "hphp/test/ext/test_ext_icu_ucsdet.h" #include "hphp/runtime/ext/ext_icu_ucsdet.h" #include "hphp/runtime/ext/ext_array.h" diff --git a/hphp/test/test_ext_icu_ucsdet.h b/hphp/test/ext/test_ext_icu_ucsdet.h similarity index 98% rename from hphp/test/test_ext_icu_ucsdet.h rename to hphp/test/ext/test_ext_icu_ucsdet.h index 7fde586e0..64c22b592 100644 --- a/hphp/test/test_ext_icu_ucsdet.h +++ b/hphp/test/ext/test_ext_icu_ucsdet.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_icu_uspoof.cpp b/hphp/test/ext/test_ext_icu_uspoof.cpp similarity index 99% rename from hphp/test/test_ext_icu_uspoof.cpp rename to hphp/test/ext/test_ext_icu_uspoof.cpp index 3e279dffa..0fb2586d2 100644 --- a/hphp/test/test_ext_icu_uspoof.cpp +++ b/hphp/test/ext/test_ext_icu_uspoof.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_icu_uspoof.h" +#include "hphp/test/ext/test_ext_icu_uspoof.h" #include "hphp/runtime/ext/ext_icu_uspoof.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_icu_uspoof.h b/hphp/test/ext/test_ext_icu_uspoof.h similarity index 97% rename from hphp/test/test_ext_icu_uspoof.h rename to hphp/test/ext/test_ext_icu_uspoof.h index 86f73ff77..3b2a61d6b 100644 --- a/hphp/test/test_ext_icu_uspoof.h +++ b/hphp/test/ext/test_ext_icu_uspoof.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_image.cpp b/hphp/test/ext/test_ext_image.cpp similarity index 99% rename from hphp/test/test_ext_image.cpp rename to hphp/test/ext/test_ext_image.cpp index 0c78a4b84..dc1f1035d 100644 --- a/hphp/test/test_ext_image.cpp +++ b/hphp/test/ext/test_ext_image.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_image.h" +#include "hphp/test/ext/test_ext_image.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_image.h b/hphp/test/ext/test_ext_image.h similarity index 99% rename from hphp/test/test_ext_image.h rename to hphp/test/ext/test_ext_image.h index 065e2a1ae..7ffacd87e 100644 --- a/hphp/test/test_ext_image.h +++ b/hphp/test/ext/test_ext_image.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_imagesprite.cpp b/hphp/test/ext/test_ext_imagesprite.cpp similarity index 99% rename from hphp/test/test_ext_imagesprite.cpp rename to hphp/test/ext/test_ext_imagesprite.cpp index dfc872316..cda1ccac3 100644 --- a/hphp/test/test_ext_imagesprite.cpp +++ b/hphp/test/ext/test_ext_imagesprite.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_imagesprite.h" +#include "hphp/test/ext/test_ext_imagesprite.h" #include "hphp/runtime/ext/ext_imagesprite.h" #include "hphp/runtime/ext/ext_url.h" diff --git a/hphp/test/test_ext_imagesprite.h b/hphp/test/ext/test_ext_imagesprite.h similarity index 97% rename from hphp/test/test_ext_imagesprite.h rename to hphp/test/ext/test_ext_imagesprite.h index a90576dd3..777fd44d2 100644 --- a/hphp/test/test_ext_imagesprite.h +++ b/hphp/test/ext/test_ext_imagesprite.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" #include "hphp/runtime/ext/ext_imagesprite.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_imap.cpp b/hphp/test/ext/test_ext_imap.cpp similarity index 99% rename from hphp/test/test_ext_imap.cpp rename to hphp/test/ext/test_ext_imap.cpp index 85b42955d..de1ed14b7 100644 --- a/hphp/test/test_ext_imap.cpp +++ b/hphp/test/ext/test_ext_imap.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_imap.h" +#include "hphp/test/ext/test_ext_imap.h" #include "hphp/runtime/ext/ext_imap.h" IMPLEMENT_SEP_EXTENSION_TEST(Imap); diff --git a/hphp/test/test_ext_imap.h b/hphp/test/ext/test_ext_imap.h similarity index 98% rename from hphp/test/test_ext_imap.h rename to hphp/test/ext/test_ext_imap.h index 50fc94af0..49125663c 100644 --- a/hphp/test/test_ext_imap.h +++ b/hphp/test/ext/test_ext_imap.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_intl.cpp b/hphp/test/ext/test_ext_intl.cpp similarity index 99% rename from hphp/test/test_ext_intl.cpp rename to hphp/test/ext/test_ext_intl.cpp index 685567960..bc4e9e1c6 100644 --- a/hphp/test/test_ext_intl.cpp +++ b/hphp/test/ext/test_ext_intl.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_intl.h" +#include "hphp/test/ext/test_ext_intl.h" #include "hphp/runtime/ext/ext_intl.h" IMPLEMENT_SEP_EXTENSION_TEST(Intl); diff --git a/hphp/test/test_ext_intl.h b/hphp/test/ext/test_ext_intl.h similarity index 98% rename from hphp/test/test_ext_intl.h rename to hphp/test/ext/test_ext_intl.h index 50630a75d..79a7f836c 100644 --- a/hphp/test/test_ext_intl.h +++ b/hphp/test/ext/test_ext_intl.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_ipc.cpp b/hphp/test/ext/test_ext_ipc.cpp similarity index 99% rename from hphp/test/test_ext_ipc.cpp rename to hphp/test/ext/test_ext_ipc.cpp index e57df2ad5..c34f4ff47 100644 --- a/hphp/test/test_ext_ipc.cpp +++ b/hphp/test/ext/test_ext_ipc.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_ipc.h" +#include "hphp/test/ext/test_ext_ipc.h" #include "hphp/runtime/ext/ext_ipc.h" #include diff --git a/hphp/test/test_ext_ipc.h b/hphp/test/ext/test_ext_ipc.h similarity index 98% rename from hphp/test/test_ext_ipc.h rename to hphp/test/ext/test_ext_ipc.h index 1813faf7e..e9b126d3c 100644 --- a/hphp/test/test_ext_ipc.h +++ b/hphp/test/ext/test_ext_ipc.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_json.cpp b/hphp/test/ext/test_ext_json.cpp similarity index 99% rename from hphp/test/test_ext_json.cpp rename to hphp/test/ext/test_ext_json.cpp index 93f93292e..91181fd05 100644 --- a/hphp/test/test_ext_json.cpp +++ b/hphp/test/ext/test_ext_json.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_json.h" +#include "hphp/test/ext/test_ext_json.h" #include "hphp/runtime/ext/ext_json.h" #include "hphp/system/lib/systemlib.h" diff --git a/hphp/test/test_ext_json.h b/hphp/test/ext/test_ext_json.h similarity index 97% rename from hphp/test/test_ext_json.h rename to hphp/test/ext/test_ext_json.h index abbfcf4d7..69f317975 100644 --- a/hphp/test/test_ext_json.h +++ b/hphp/test/ext/test_ext_json.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_ldap.cpp b/hphp/test/ext/test_ext_ldap.cpp similarity index 99% rename from hphp/test/test_ext_ldap.cpp rename to hphp/test/ext/test_ext_ldap.cpp index 5d1e2e977..3d42dc308 100644 --- a/hphp/test/test_ext_ldap.cpp +++ b/hphp/test/ext/test_ext_ldap.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_ldap.h" +#include "hphp/test/ext/test_ext_ldap.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_ldap.h b/hphp/test/ext/test_ext_ldap.h similarity index 98% rename from hphp/test/test_ext_ldap.h rename to hphp/test/ext/test_ext_ldap.h index c991f77a8..3ac0bc89c 100644 --- a/hphp/test/test_ext_ldap.h +++ b/hphp/test/ext/test_ext_ldap.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_magick.cpp b/hphp/test/ext/test_ext_magick.cpp similarity index 96% rename from hphp/test/test_ext_magick.cpp rename to hphp/test/ext/test_ext_magick.cpp index 9897b7bc5..0d0b4f8ee 100644 --- a/hphp/test/test_ext_magick.cpp +++ b/hphp/test/ext/test_ext_magick.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_magick.h" +#include "hphp/test/ext/test_ext_magick.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_magick.h b/hphp/test/ext/test_ext_magick.h similarity index 99% rename from hphp/test/test_ext_magick.h rename to hphp/test/ext/test_ext_magick.h index e4e696d10..8e3fdf161 100644 --- a/hphp/test/test_ext_magick.h +++ b/hphp/test/ext/test_ext_magick.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_mailparse.cpp b/hphp/test/ext/test_ext_mailparse.cpp similarity index 98% rename from hphp/test/test_ext_mailparse.cpp rename to hphp/test/ext/test_ext_mailparse.cpp index e11c6324f..6943a6804 100644 --- a/hphp/test/test_ext_mailparse.cpp +++ b/hphp/test/ext/test_ext_mailparse.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_mailparse.h" +#include "hphp/test/ext/test_ext_mailparse.h" #include "hphp/runtime/ext/ext.h" /////////////////////////////////////////////////////////////////////////////// @@ -59,8 +59,8 @@ bool TestExtMailparse::test_mailparse_msg_create() { for (unsigned int i = 0; i < sizeof(files)/sizeof(files[0]); i++) { string file = files[i]; - string testname = "test/test_ext_mailparse." + file + ".txt"; - string expname = "test/test_ext_mailparse." + file + ".exp"; + string testname = "test/ext/test_ext_mailparse." + file + ".txt"; + string expname = "test/ext/test_ext_mailparse." + file + ".exp"; Variant mime = f_mailparse_msg_create(); PlainFile input; diff --git a/hphp/test/test_ext_mailparse.h b/hphp/test/ext/test_ext_mailparse.h similarity index 98% rename from hphp/test/test_ext_mailparse.h rename to hphp/test/ext/test_ext_mailparse.h index 7ab1410cf..486619ef2 100644 --- a/hphp/test/test_ext_mailparse.h +++ b/hphp/test/ext/test_ext_mailparse.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_mailparse.mime.exp b/hphp/test/ext/test_ext_mailparse.mime.exp similarity index 100% rename from hphp/test/test_ext_mailparse.mime.exp rename to hphp/test/ext/test_ext_mailparse.mime.exp diff --git a/hphp/test/test_ext_mailparse.mime.txt b/hphp/test/ext/test_ext_mailparse.mime.txt similarity index 96% rename from hphp/test/test_ext_mailparse.mime.txt rename to hphp/test/ext/test_ext_mailparse.mime.txt index 1664a6ff5..e8edb93be 100644 --- a/hphp/test/test_ext_mailparse.mime.txt +++ b/hphp/test/ext/test_ext_mailparse.mime.txt @@ -1,47 +1,47 @@ -Return-Path: -Received: from TITAN (titan.brainnet.i [192.168.2.7]) - by zaneeb.brainnet.i (8.10.2/8.10.2/SuSE Linux 8.10.0-0.3) with ESMTP id g87BfJ721279 - for ; Sat, 7 Sep 2002 12:41:19 +0100 -X-Authentication-Warning: zaneeb.brainnet.i: Host titan.brainnet.i [192.168.2.7] claimed to be TITAN -From: "Wez Furlong" -To: -Subject: mime attach -Date: Sat, 7 Sep 2002 12:41:14 +0100 -Message-ID: <000601c25663$78b7fcf0$0702a8c0@TITAN> -MIME-Version: 1.0 -Content-Type: multipart/mixed; - boundary="----=_NextPart_000_0007_01C2566B.DA7C64F0" -X-Priority: 3 (Normal) -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook, Build 10.0.2627 -Importance: Normal -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 -X-TBR-DestBox: user.wez (auth as wez) (wez:) - -This is a multi-part message in MIME format. - -------=_NextPart_000_0007_01C2566B.DA7C64F0 -Content-Type: text/plain; - charset="us-ascii" -Content-Transfer-Encoding: 7bit - -this is a message with regular mime attachment. - -------=_NextPart_000_0007_01C2566B.DA7C64F0 -Content-Type: application/octet-stream; - name="README" -Content-Transfer-Encoding: quoted-printable -Content-Disposition: attachment; - filename="README" - -FooBar - blah blah blah foo bar bar baaaa=0A= -=0A= -Requirements: =0A= - o php with mailparse=0A= - o virus scanner (optional)=0A= - =0A= -=0A= - -------=_NextPart_000_0007_01C2566B.DA7C64F0-- - - +Return-Path: +Received: from TITAN (titan.brainnet.i [192.168.2.7]) + by zaneeb.brainnet.i (8.10.2/8.10.2/SuSE Linux 8.10.0-0.3) with ESMTP id g87BfJ721279 + for ; Sat, 7 Sep 2002 12:41:19 +0100 +X-Authentication-Warning: zaneeb.brainnet.i: Host titan.brainnet.i [192.168.2.7] claimed to be TITAN +From: "Wez Furlong" +To: +Subject: mime attach +Date: Sat, 7 Sep 2002 12:41:14 +0100 +Message-ID: <000601c25663$78b7fcf0$0702a8c0@TITAN> +MIME-Version: 1.0 +Content-Type: multipart/mixed; + boundary="----=_NextPart_000_0007_01C2566B.DA7C64F0" +X-Priority: 3 (Normal) +X-MSMail-Priority: Normal +X-Mailer: Microsoft Outlook, Build 10.0.2627 +Importance: Normal +X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 +X-TBR-DestBox: user.wez (auth as wez) (wez:) + +This is a multi-part message in MIME format. + +------=_NextPart_000_0007_01C2566B.DA7C64F0 +Content-Type: text/plain; + charset="us-ascii" +Content-Transfer-Encoding: 7bit + +this is a message with regular mime attachment. + +------=_NextPart_000_0007_01C2566B.DA7C64F0 +Content-Type: application/octet-stream; + name="README" +Content-Transfer-Encoding: quoted-printable +Content-Disposition: attachment; + filename="README" + +FooBar - blah blah blah foo bar bar baaaa=0A= +=0A= +Requirements: =0A= + o php with mailparse=0A= + o virus scanner (optional)=0A= + =0A= +=0A= + +------=_NextPart_000_0007_01C2566B.DA7C64F0-- + + diff --git a/hphp/test/test_ext_mailparse.phpcvs1.exp b/hphp/test/ext/test_ext_mailparse.phpcvs1.exp similarity index 100% rename from hphp/test/test_ext_mailparse.phpcvs1.exp rename to hphp/test/ext/test_ext_mailparse.phpcvs1.exp diff --git a/hphp/test/test_ext_mailparse.phpcvs1.txt b/hphp/test/ext/test_ext_mailparse.phpcvs1.txt similarity index 97% rename from hphp/test/test_ext_mailparse.phpcvs1.txt rename to hphp/test/ext/test_ext_mailparse.phpcvs1.txt index 9da14a632..1440331a1 100644 --- a/hphp/test/test_ext_mailparse.phpcvs1.txt +++ b/hphp/test/ext/test_ext_mailparse.phpcvs1.txt @@ -1,141 +1,141 @@ -Return-Path: -Received: from secure.thebrainroom.com (raq338.uk2net.com [213.239.42.171]) - by zaneeb.brainnet.i (8.10.2/8.10.2/SuSE Linux 8.10.0-0.3) with ESMTP id g9SLLB208234 - for ; Mon, 28 Oct 2002 21:21:11 GMT -X-Authentication-Warning: zaneeb.brainnet.i: Host raq338.uk2net.com [213.239.42.171] claimed to be secure.thebrainroom.com -Received: from pb1.pair.com (pb1.pair.com [216.92.131.4]) - by secure.thebrainroom.com (8.9.3/8.9.3) with SMTP id SAA02428 - for ; Mon, 28 Oct 2002 18:50:26 GMT -Received: (qmail 63230 invoked by uid 1010); 28 Oct 2002 18:36:34 -0000 -Mailing-List: contact php-cvs-help@lists.php.net; run by ezmlm -Precedence: bulk -list-help: -list-unsubscribe: -list-post: -Delivered-To: mailing list php-cvs@lists.php.net -Received: (qmail 63215 invoked from network); 28 Oct 2002 18:36:33 -0000 -Reply-to: marcus.boerger@post.rwth-aachen.de -Message-Id: <5.1.0.14.2.20021028193555.01d47c20@mailbox.rwth-aachen.de> -X-Mailer: QUALCOMM Windows Eudora Version 5.1 -Date: Mon, 28 Oct 2002 19:36:10 +0100 -To: Melvyn Sopacua -From: marcus.boerger@t-online.de (Marcus =?iso-8859-1?Q?B=F6rger?=) -Cc: php-cvs@lists.php.net -In-Reply-To: <5.1.0.14.2.20021028192151.039729e0@yoshimo.webtechs.idg.nl - > -References: <5.1.0.14.2.20021028190015.01d4d650@mailbox.rwth-aachen.de> - <5.1.0.14.2.20021028183051.03c18958@yoshimo.webtechs.idg.nl> - -Mime-Version: 1.0 -Content-Type: multipart/alternative; - boundary="=====================_71195359==_.ALT" -X-Sender: 520072483730-0001@t-dialin.net -X-Spam-Status: No, tests=bogofilter, spamicity=0.0% likelihood -Subject: Re: [PHP-CVS] cvs: php4 /ext/iconv/tests -X-TBR-DestBox: user.wez.php.cvs (auth as wez) (wez.php.cvs:) - ---=====================_71195359==_.ALT -Content-Type: text/plain; charset="iso-8859-1"; format=flowed -Content-Transfer-Encoding: quoted-printable - -Then what about: - -cvs -z3 -q diff skipif.inc test.inc (in directory=20 -S:\php4-HEAD\ext\iconv\tests\) -Index: skipif.inc -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -RCS file: /repository/php4/ext/iconv/tests/skipif.inc,v -retrieving revision 1.2 -diff -u -r1.2 skipif.inc ---- skipif.inc 28 Oct 2002 17:15:21 -0000 1.2 -+++ skipif.inc 28 Oct 2002 18:35:25 -0000 -@@ -1,10 +1,11 @@ - - -At 19:30 28.10.2002, Melvyn Sopacua wrote: ->At 19:01 28-10-2002, Marcus B=F6rger wrote: -> ->>At 18:33 28.10.2002, Melvyn Sopacua wrote: ->>>At 18:15 28-10-2002, Marcus B=F6rger wrote: ->>> ->>>> Log: ->>>> fix this tests ->>>> -they did not dl load module in test.... ->>> ->>>Yes, exactly as they shouldn't. ->>> ->>>It's been discussed. Why did you revert that? ->>> ->>>The main reason - to repeat it: ->>>./configure --prefix=3D/previous/install ->>> ->>>dl('foo.so') =3D> foo.so version is previous install, not current! ->> ->>I did so because skipif.inc did so. Maybe we remove that code ->>from both skipif.inc and test.inc now. Feel free to do that. -> ->Ok, then that was a left over. -> ->IMHO we should do a complete overhaul of */tests/* and remove any dl() ->code, or come up with something, that will force the modules/ directory ->on the testkit. -> ->This is again a good reason to setup php.ini-test. ->Windows will then be a problem, which kinda makes the dl() thingy= - troublesome ->as well. -> ->The only thing I can think of to work around it, is to use a configure ->option, that writes --with-test-modules-dir=3D into php.ini-test. But= - that's ->prolly overkill. -> -> -> ->Met vriendelijke groeten / With kind regards, -> ->Webmaster IDG.nl ->Melvyn Sopacua -> - ---=====================_71195359==_.ALT-- - +Return-Path: +Received: from secure.thebrainroom.com (raq338.uk2net.com [213.239.42.171]) + by zaneeb.brainnet.i (8.10.2/8.10.2/SuSE Linux 8.10.0-0.3) with ESMTP id g9SLLB208234 + for ; Mon, 28 Oct 2002 21:21:11 GMT +X-Authentication-Warning: zaneeb.brainnet.i: Host raq338.uk2net.com [213.239.42.171] claimed to be secure.thebrainroom.com +Received: from pb1.pair.com (pb1.pair.com [216.92.131.4]) + by secure.thebrainroom.com (8.9.3/8.9.3) with SMTP id SAA02428 + for ; Mon, 28 Oct 2002 18:50:26 GMT +Received: (qmail 63230 invoked by uid 1010); 28 Oct 2002 18:36:34 -0000 +Mailing-List: contact php-cvs-help@lists.php.net; run by ezmlm +Precedence: bulk +list-help: +list-unsubscribe: +list-post: +Delivered-To: mailing list php-cvs@lists.php.net +Received: (qmail 63215 invoked from network); 28 Oct 2002 18:36:33 -0000 +Reply-to: marcus.boerger@post.rwth-aachen.de +Message-Id: <5.1.0.14.2.20021028193555.01d47c20@mailbox.rwth-aachen.de> +X-Mailer: QUALCOMM Windows Eudora Version 5.1 +Date: Mon, 28 Oct 2002 19:36:10 +0100 +To: Melvyn Sopacua +From: marcus.boerger@t-online.de (Marcus =?iso-8859-1?Q?B=F6rger?=) +Cc: php-cvs@lists.php.net +In-Reply-To: <5.1.0.14.2.20021028192151.039729e0@yoshimo.webtechs.idg.nl + > +References: <5.1.0.14.2.20021028190015.01d4d650@mailbox.rwth-aachen.de> + <5.1.0.14.2.20021028183051.03c18958@yoshimo.webtechs.idg.nl> + +Mime-Version: 1.0 +Content-Type: multipart/alternative; + boundary="=====================_71195359==_.ALT" +X-Sender: 520072483730-0001@t-dialin.net +X-Spam-Status: No, tests=bogofilter, spamicity=0.0% likelihood +Subject: Re: [PHP-CVS] cvs: php4 /ext/iconv/tests +X-TBR-DestBox: user.wez.php.cvs (auth as wez) (wez.php.cvs:) + +--=====================_71195359==_.ALT +Content-Type: text/plain; charset="iso-8859-1"; format=flowed +Content-Transfer-Encoding: quoted-printable + +Then what about: + +cvs -z3 -q diff skipif.inc test.inc (in directory=20 +S:\php4-HEAD\ext\iconv\tests\) +Index: skipif.inc +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +RCS file: /repository/php4/ext/iconv/tests/skipif.inc,v +retrieving revision 1.2 +diff -u -r1.2 skipif.inc +--- skipif.inc 28 Oct 2002 17:15:21 -0000 1.2 ++++ skipif.inc 28 Oct 2002 18:35:25 -0000 +@@ -1,10 +1,11 @@ + + +At 19:30 28.10.2002, Melvyn Sopacua wrote: +>At 19:01 28-10-2002, Marcus B=F6rger wrote: +> +>>At 18:33 28.10.2002, Melvyn Sopacua wrote: +>>>At 18:15 28-10-2002, Marcus B=F6rger wrote: +>>> +>>>> Log: +>>>> fix this tests +>>>> -they did not dl load module in test.... +>>> +>>>Yes, exactly as they shouldn't. +>>> +>>>It's been discussed. Why did you revert that? +>>> +>>>The main reason - to repeat it: +>>>./configure --prefix=3D/previous/install +>>> +>>>dl('foo.so') =3D> foo.so version is previous install, not current! +>> +>>I did so because skipif.inc did so. Maybe we remove that code +>>from both skipif.inc and test.inc now. Feel free to do that. +> +>Ok, then that was a left over. +> +>IMHO we should do a complete overhaul of */tests/* and remove any dl() +>code, or come up with something, that will force the modules/ directory +>on the testkit. +> +>This is again a good reason to setup php.ini-test. +>Windows will then be a problem, which kinda makes the dl() thingy= + troublesome +>as well. +> +>The only thing I can think of to work around it, is to use a configure +>option, that writes --with-test-modules-dir=3D into php.ini-test. But= + that's +>prolly overkill. +> +> +> +>Met vriendelijke groeten / With kind regards, +> +>Webmaster IDG.nl +>Melvyn Sopacua +> + +--=====================_71195359==_.ALT-- + diff --git a/hphp/test/test_ext_mailparse.qp.exp b/hphp/test/ext/test_ext_mailparse.qp.exp similarity index 100% rename from hphp/test/test_ext_mailparse.qp.exp rename to hphp/test/ext/test_ext_mailparse.qp.exp diff --git a/hphp/test/test_ext_mailparse.qp.txt b/hphp/test/ext/test_ext_mailparse.qp.txt similarity index 96% rename from hphp/test/test_ext_mailparse.qp.txt rename to hphp/test/ext/test_ext_mailparse.qp.txt index 249d6f432..9904743b1 100644 --- a/hphp/test/test_ext_mailparse.qp.txt +++ b/hphp/test/ext/test_ext_mailparse.qp.txt @@ -1,47 +1,47 @@ -Return-Path: -Received: from TITAN (titan.brainnet.i [192.168.2.7]) - by zaneeb.brainnet.i (8.10.2/8.10.2/SuSE Linux 8.10.0-0.3) with ESMTP id g87Bel721254 - for ; Sat, 7 Sep 2002 12:40:47 +0100 -X-Authentication-Warning: zaneeb.brainnet.i: Host titan.brainnet.i [192.168.2.7] claimed to be TITAN -From: "Wez Furlong" -To: -Subject: qp attachments -Date: Sat, 7 Sep 2002 12:40:37 +0100 -Message-ID: <000201c25663$65e80250$0702a8c0@TITAN> -MIME-Version: 1.0 -Content-Type: multipart/mixed; - boundary="----=_NextPart_000_0003_01C2566B.C7AC6A50" -X-Priority: 3 (Normal) -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook, Build 10.0.2627 -Importance: Normal -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 -X-TBR-DestBox: user.wez (auth as wez) (wez:) - -This is a multi-part message in MIME format. - -------=_NextPart_000_0003_01C2566B.C7AC6A50 -Content-Type: text/plain; - charset="us-ascii" -Content-Transfer-Encoding: 7bit - -this is a message with a qp attachment. - -------=_NextPart_000_0003_01C2566B.C7AC6A50 -Content-Type: application/octet-stream; - name="README" -Content-Transfer-Encoding: quoted-printable -Content-Disposition: attachment; - filename="README" - -Xnti rpam and gnti yirusjkools for bendmail=0A= -=0A= -Requirements: =0A= - o php with mailparse=0A= - o virus scanner (optional)=0A= - =0A= -=0A= - -------=_NextPart_000_0003_01C2566B.C7AC6A50-- - - +Return-Path: +Received: from TITAN (titan.brainnet.i [192.168.2.7]) + by zaneeb.brainnet.i (8.10.2/8.10.2/SuSE Linux 8.10.0-0.3) with ESMTP id g87Bel721254 + for ; Sat, 7 Sep 2002 12:40:47 +0100 +X-Authentication-Warning: zaneeb.brainnet.i: Host titan.brainnet.i [192.168.2.7] claimed to be TITAN +From: "Wez Furlong" +To: +Subject: qp attachments +Date: Sat, 7 Sep 2002 12:40:37 +0100 +Message-ID: <000201c25663$65e80250$0702a8c0@TITAN> +MIME-Version: 1.0 +Content-Type: multipart/mixed; + boundary="----=_NextPart_000_0003_01C2566B.C7AC6A50" +X-Priority: 3 (Normal) +X-MSMail-Priority: Normal +X-Mailer: Microsoft Outlook, Build 10.0.2627 +Importance: Normal +X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 +X-TBR-DestBox: user.wez (auth as wez) (wez:) + +This is a multi-part message in MIME format. + +------=_NextPart_000_0003_01C2566B.C7AC6A50 +Content-Type: text/plain; + charset="us-ascii" +Content-Transfer-Encoding: 7bit + +this is a message with a qp attachment. + +------=_NextPart_000_0003_01C2566B.C7AC6A50 +Content-Type: application/octet-stream; + name="README" +Content-Transfer-Encoding: quoted-printable +Content-Disposition: attachment; + filename="README" + +Xnti rpam and gnti yirusjkools for bendmail=0A= +=0A= +Requirements: =0A= + o php with mailparse=0A= + o virus scanner (optional)=0A= + =0A= +=0A= + +------=_NextPart_000_0003_01C2566B.C7AC6A50-- + + diff --git a/hphp/test/test_ext_mailparse.uue.exp b/hphp/test/ext/test_ext_mailparse.uue.exp similarity index 100% rename from hphp/test/test_ext_mailparse.uue.exp rename to hphp/test/ext/test_ext_mailparse.uue.exp diff --git a/hphp/test/test_ext_mailparse.uue.txt b/hphp/test/ext/test_ext_mailparse.uue.txt similarity index 97% rename from hphp/test/test_ext_mailparse.uue.txt rename to hphp/test/ext/test_ext_mailparse.uue.txt index 01c0a5cc3..b45c05105 100644 --- a/hphp/test/test_ext_mailparse.uue.txt +++ b/hphp/test/ext/test_ext_mailparse.uue.txt @@ -1,27 +1,27 @@ -Return-Path: -Received: from TITAN (titan.brainnet.i [192.168.2.7]) - by zaneeb.brainnet.i (8.10.2/8.10.2/SuSE Linux 8.10.0-0.3) with ESMTP id g87Be5721229 - for ; Sat, 7 Sep 2002 12:40:05 +0100 -X-Authentication-Warning: zaneeb.brainnet.i: Host titan.brainnet.i [192.168.2.7] claimed to be TITAN -From: "Wez Furlong" -To: -Subject: UUEncoded attachments -Date: Sat, 7 Sep 2002 12:39:55 +0100 -Message-ID: <000001c25663$4cd5b460$0702a8c0@TITAN> -X-Priority: 3 (Normal) -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook, Build 10.0.2627 -Importance: Normal -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 -X-TBR-DestBox: user.wez (auth as wez) (wez:) - -Hello, this is a message with UUE attachments. - - -begin 644 README.dat -M1F]O0F%R("T@0F%A86%A"@I297%U:7)E;65N=',Z(`H);R!P:'`@=VET:"!M -K86EL<&%R +Received: from TITAN (titan.brainnet.i [192.168.2.7]) + by zaneeb.brainnet.i (8.10.2/8.10.2/SuSE Linux 8.10.0-0.3) with ESMTP id g87Be5721229 + for ; Sat, 7 Sep 2002 12:40:05 +0100 +X-Authentication-Warning: zaneeb.brainnet.i: Host titan.brainnet.i [192.168.2.7] claimed to be TITAN +From: "Wez Furlong" +To: +Subject: UUEncoded attachments +Date: Sat, 7 Sep 2002 12:39:55 +0100 +Message-ID: <000001c25663$4cd5b460$0702a8c0@TITAN> +X-Priority: 3 (Normal) +X-MSMail-Priority: Normal +X-Mailer: Microsoft Outlook, Build 10.0.2627 +Importance: Normal +X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 +X-TBR-DestBox: user.wez (auth as wez) (wez:) + +Hello, this is a message with UUE attachments. + + +begin 644 README.dat +M1F]O0F%R("T@0F%A86%A"@I297%U:7)E;65N=',Z(`H);R!P:'`@=VET:"!M +K86EL<&%R>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_mb.cpp b/hphp/test/ext/test_ext_mb.cpp similarity index 99% rename from hphp/test/test_ext_mb.cpp rename to hphp/test/ext/test_ext_mb.cpp index 5626777a3..f410e34d3 100644 --- a/hphp/test/test_ext_mb.cpp +++ b/hphp/test/ext/test_ext_mb.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_mb.h" +#include "hphp/test/ext/test_ext_mb.h" #include "hphp/runtime/ext/ext_mb.h" #include "hphp/runtime/ext/ext_string.h" #include "hphp/runtime/ext/ext_array.h" diff --git a/hphp/test/test_ext_mb.h b/hphp/test/ext/test_ext_mb.h similarity index 98% rename from hphp/test/test_ext_mb.h rename to hphp/test/ext/test_ext_mb.h index 2e48af383..0e6002f95 100644 --- a/hphp/test/test_ext_mb.h +++ b/hphp/test/ext/test_ext_mb.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_mcrypt.cpp b/hphp/test/ext/test_ext_mcrypt.cpp similarity index 99% rename from hphp/test/test_ext_mcrypt.cpp rename to hphp/test/ext/test_ext_mcrypt.cpp index f7be9fca3..cf63a26e3 100644 --- a/hphp/test/test_ext_mcrypt.cpp +++ b/hphp/test/ext/test_ext_mcrypt.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_mcrypt.h" +#include "hphp/test/ext/test_ext_mcrypt.h" #include "hphp/runtime/ext/ext_mcrypt.h" #include "hphp/runtime/ext/ext_string.h" diff --git a/hphp/test/test_ext_mcrypt.h b/hphp/test/ext/test_ext_mcrypt.h similarity index 98% rename from hphp/test/test_ext_mcrypt.h rename to hphp/test/ext/test_ext_mcrypt.h index 483902e9a..0b275250a 100644 --- a/hphp/test/test_ext_mcrypt.h +++ b/hphp/test/ext/test_ext_mcrypt.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_memcache.cpp b/hphp/test/ext/test_ext_memcache.cpp similarity index 98% rename from hphp/test/test_ext_memcache.cpp rename to hphp/test/ext/test_ext_memcache.cpp index fe58f25de..7580756d5 100644 --- a/hphp/test/test_ext_memcache.cpp +++ b/hphp/test/ext/test_ext_memcache.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_memcache.h" +#include "hphp/test/ext/test_ext_memcache.h" #include "hphp/runtime/ext/ext_memcache.h" IMPLEMENT_SEP_EXTENSION_TEST(Memcache); diff --git a/hphp/test/test_ext_memcache.h b/hphp/test/ext/test_ext_memcache.h similarity index 98% rename from hphp/test/test_ext_memcache.h rename to hphp/test/ext/test_ext_memcache.h index cb959e93d..c42a87f3c 100644 --- a/hphp/test/test_ext_memcache.h +++ b/hphp/test/ext/test_ext_memcache.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_memcached.cpp b/hphp/test/ext/test_ext_memcached.cpp similarity index 99% rename from hphp/test/test_ext_memcached.cpp rename to hphp/test/ext/test_ext_memcached.cpp index 7fd57c4ad..6c73664e1 100644 --- a/hphp/test/test_ext_memcached.cpp +++ b/hphp/test/ext/test_ext_memcached.cpp @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_memcached.h" +#include "hphp/test/ext/test_ext_memcached.h" #include "hphp/runtime/ext/ext_memcached.h" #include "hphp/runtime/ext/ext_options.h" #include diff --git a/hphp/test/test_ext_memcached.h b/hphp/test/ext/test_ext_memcached.h similarity index 97% rename from hphp/test/test_ext_memcached.h rename to hphp/test/ext/test_ext_memcached.h index 76a7424c2..8d65b9701 100644 --- a/hphp/test/test_ext_memcached.h +++ b/hphp/test/ext/test_ext_memcached.h @@ -19,7 +19,7 @@ #ifndef incl_HPHP_TEST_EXT_MEMCACHED_H_ #define incl_HPHP_TEST_EXT_MEMCACHED_H_ -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_misc.cpp b/hphp/test/ext/test_ext_misc.cpp similarity index 99% rename from hphp/test/test_ext_misc.cpp rename to hphp/test/ext/test_ext_misc.cpp index c568635c5..684c74384 100644 --- a/hphp/test/test_ext_misc.cpp +++ b/hphp/test/ext/test_ext_misc.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_misc.h" +#include "hphp/test/ext/test_ext_misc.h" #include "hphp/runtime/ext/ext_misc.h" #include "hphp/runtime/ext/ext_string.h" diff --git a/hphp/test/test_ext_misc.h b/hphp/test/ext/test_ext_misc.h similarity index 98% rename from hphp/test/test_ext_misc.h rename to hphp/test/ext/test_ext_misc.h index ebd754de4..3475fcc32 100644 --- a/hphp/test/test_ext_misc.h +++ b/hphp/test/ext/test_ext_misc.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_mysql.cpp b/hphp/test/ext/test_ext_mysql.cpp similarity index 99% rename from hphp/test/test_ext_mysql.cpp rename to hphp/test/ext/test_ext_mysql.cpp index bcc8efc53..1a4d23a93 100644 --- a/hphp/test/test_ext_mysql.cpp +++ b/hphp/test/ext/test_ext_mysql.cpp @@ -14,10 +14,10 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_mysql.h" +#include "hphp/test/ext/test_ext_mysql.h" #include "hphp/runtime/ext/ext_mysql.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/test/test_mysql_info.h" +#include "hphp/test/ext/test_mysql_info.h" #include "mysql/errmsg.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_mysql.h b/hphp/test/ext/test_ext_mysql.h similarity index 98% rename from hphp/test/test_ext_mysql.h rename to hphp/test/ext/test_ext_mysql.h index d75f7e20a..45286ddd4 100644 --- a/hphp/test/test_ext_mysql.h +++ b/hphp/test/ext/test_ext_mysql.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_network.cpp b/hphp/test/ext/test_ext_network.cpp similarity index 99% rename from hphp/test/test_ext_network.cpp rename to hphp/test/ext/test_ext_network.cpp index 1fc181666..58cf549aa 100644 --- a/hphp/test/test_ext_network.cpp +++ b/hphp/test/ext/test_ext_network.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_network.h" +#include "hphp/test/ext/test_ext_network.h" #include "hphp/runtime/ext/ext_network.h" #include "hphp/runtime/ext/ext_file.h" #include "hphp/runtime/ext/ext_string.h" diff --git a/hphp/test/test_ext_network.h b/hphp/test/ext/test_ext_network.h similarity index 98% rename from hphp/test/test_ext_network.h rename to hphp/test/ext/test_ext_network.h index 1105c7dd6..3f75ccba3 100644 --- a/hphp/test/test_ext_network.h +++ b/hphp/test/ext/test_ext_network.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_openssl.cpp b/hphp/test/ext/test_ext_openssl.cpp similarity index 99% rename from hphp/test/test_ext_openssl.cpp rename to hphp/test/ext/test_ext_openssl.cpp index 728b3f17c..97d99d2d8 100644 --- a/hphp/test/test_ext_openssl.cpp +++ b/hphp/test/ext/test_ext_openssl.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_openssl.h" +#include "hphp/test/ext/test_ext_openssl.h" #include "hphp/runtime/ext/ext_openssl.h" #include "hphp/runtime/ext/ext_file.h" #include "hphp/runtime/ext/ext_string.h" diff --git a/hphp/test/test_ext_openssl.h b/hphp/test/ext/test_ext_openssl.h similarity index 98% rename from hphp/test/test_ext_openssl.h rename to hphp/test/ext/test_ext_openssl.h index 7ef152288..be450dbfe 100644 --- a/hphp/test/test_ext_openssl.h +++ b/hphp/test/ext/test_ext_openssl.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_options.cpp b/hphp/test/ext/test_ext_options.cpp similarity index 99% rename from hphp/test/test_ext_options.cpp rename to hphp/test/ext/test_ext_options.cpp index cf66caf83..2d551b561 100644 --- a/hphp/test/test_ext_options.cpp +++ b/hphp/test/ext/test_ext_options.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_options.h" +#include "hphp/test/ext/test_ext_options.h" #include "hphp/runtime/ext/ext_options.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_options.h b/hphp/test/ext/test_ext_options.h similarity index 98% rename from hphp/test/test_ext_options.h rename to hphp/test/ext/test_ext_options.h index a1310dac8..94a323833 100644 --- a/hphp/test/test_ext_options.h +++ b/hphp/test/ext/test_ext_options.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_output.cpp b/hphp/test/ext/test_ext_output.cpp similarity index 99% rename from hphp/test/test_ext_output.cpp rename to hphp/test/ext/test_ext_output.cpp index 7a23c3105..e77db4010 100644 --- a/hphp/test/test_ext_output.cpp +++ b/hphp/test/ext/test_ext_output.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_output.h" +#include "hphp/test/ext/test_ext_output.h" #include "hphp/runtime/ext/ext_output.h" IMPLEMENT_SEP_EXTENSION_TEST(Output); diff --git a/hphp/test/test_ext_output.h b/hphp/test/ext/test_ext_output.h similarity index 98% rename from hphp/test/test_ext_output.h rename to hphp/test/ext/test_ext_output.h index b55e6cbcf..5f0e5454a 100644 --- a/hphp/test/test_ext_output.h +++ b/hphp/test/ext/test_ext_output.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_pdo.cpp b/hphp/test/ext/test_ext_pdo.cpp similarity index 98% rename from hphp/test/test_ext_pdo.cpp rename to hphp/test/ext/test_ext_pdo.cpp index 01291000b..defd07cfd 100644 --- a/hphp/test/test_ext_pdo.cpp +++ b/hphp/test/ext/test_ext_pdo.cpp @@ -14,12 +14,12 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_pdo.h" +#include "hphp/test/ext/test_ext_pdo.h" #include "hphp/runtime/ext/ext_mysql.h" #include "hphp/runtime/ext/ext_pdo.h" #include "hphp/runtime/ext/ext_sqlite3.h" #include "hphp/runtime/ext/ext_file.h" -#include "hphp/test/test_mysql_info.h" +#include "hphp/test/ext/test_mysql_info.h" IMPLEMENT_SEP_EXTENSION_TEST(Pdo); /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_pdo.h b/hphp/test/ext/test_ext_pdo.h similarity index 97% rename from hphp/test/test_ext_pdo.h rename to hphp/test/ext/test_ext_pdo.h index 0db21622a..b67ed2991 100644 --- a/hphp/test/test_ext_pdo.h +++ b/hphp/test/ext/test_ext_pdo.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_posix.cpp b/hphp/test/ext/test_ext_posix.cpp similarity index 98% rename from hphp/test/test_ext_posix.cpp rename to hphp/test/ext/test_ext_posix.cpp index c226ff7f5..0b94f7638 100644 --- a/hphp/test/test_ext_posix.cpp +++ b/hphp/test/ext/test_ext_posix.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_posix.h" +#include "hphp/test/ext/test_ext_posix.h" #include "hphp/runtime/ext/ext_posix.h" #include "hphp/runtime/ext/ext_file.h" @@ -65,7 +65,7 @@ bool TestExtPosix::RunTests(const std::string &which) { /////////////////////////////////////////////////////////////////////////////// bool TestExtPosix::test_posix_access() { - VERIFY(f_posix_access("test/test_ext_posix.cpp")); + VERIFY(f_posix_access("test/ext/test_ext_posix.cpp")); return Count(true); } diff --git a/hphp/test/test_ext_posix.h b/hphp/test/ext/test_ext_posix.h similarity index 98% rename from hphp/test/test_ext_posix.h rename to hphp/test/ext/test_ext_posix.h index 1fa9e64d2..99858de91 100644 --- a/hphp/test/test_ext_posix.h +++ b/hphp/test/ext/test_ext_posix.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_preg.cpp b/hphp/test/ext/test_ext_preg.cpp similarity index 99% rename from hphp/test/test_ext_preg.cpp rename to hphp/test/ext/test_ext_preg.cpp index 833bf99c8..bd019b3e3 100644 --- a/hphp/test/test_ext_preg.cpp +++ b/hphp/test/ext/test_ext_preg.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_preg.h" +#include "hphp/test/ext/test_ext_preg.h" #include "hphp/runtime/ext/ext_preg.h" #include "hphp/runtime/ext/ext_array.h" #include "hphp/runtime/ext/ext_string.h" diff --git a/hphp/test/test_ext_preg.h b/hphp/test/ext/test_ext_preg.h similarity index 97% rename from hphp/test/test_ext_preg.h rename to hphp/test/ext/test_ext_preg.h index 01c14713d..fbc9e7c82 100644 --- a/hphp/test/test_ext_preg.h +++ b/hphp/test/ext/test_ext_preg.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_process.cpp b/hphp/test/ext/test_ext_process.cpp similarity index 98% rename from hphp/test/test_ext_process.cpp rename to hphp/test/ext/test_ext_process.cpp index 9cfdb7ed2..1a5c222bc 100644 --- a/hphp/test/test_ext_process.cpp +++ b/hphp/test/ext/test_ext_process.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_process.h" +#include "hphp/test/ext/test_ext_process.h" #include "hphp/runtime/ext/ext_process.h" #include "hphp/runtime/ext/ext_file.h" #include "hphp/runtime/base/file/file.h" @@ -105,7 +105,7 @@ bool TestExtProcess::test_pcntl_exec() { bool TestExtProcess::test_pcntl_fork() { int pid = f_pcntl_fork(); if (pid == 0) { - exit(123); + _exit(123); } Variant status; f_pcntl_wait(ref(status)); @@ -130,7 +130,7 @@ bool TestExtProcess::test_pcntl_signal() { bool TestExtProcess::test_pcntl_wait() { int pid = f_pcntl_fork(); if (pid == 0) { - exit(0x12); + _exit(0x12); } Variant status; f_pcntl_wait(ref(status)); @@ -141,7 +141,7 @@ bool TestExtProcess::test_pcntl_wait() { bool TestExtProcess::test_pcntl_waitpid() { int pid = f_pcntl_fork(); if (pid == 0) { - exit(0x12); + _exit(0x12); } Variant status; f_pcntl_waitpid(0, ref(status)); @@ -152,7 +152,7 @@ bool TestExtProcess::test_pcntl_waitpid() { bool TestExtProcess::test_pcntl_wexitstatus() { int pid = f_pcntl_fork(); if (pid == 0) { - exit(0x80); + _exit(0x80); } Variant status; f_pcntl_waitpid(0, ref(status)); @@ -163,7 +163,7 @@ bool TestExtProcess::test_pcntl_wexitstatus() { bool TestExtProcess::test_pcntl_wifexited() { int pid = f_pcntl_fork(); if (pid == 0) { - exit(0x12); + _exit(0x12); } Variant status; f_pcntl_waitpid(0, ref(status)); @@ -174,7 +174,7 @@ bool TestExtProcess::test_pcntl_wifexited() { bool TestExtProcess::test_pcntl_wifsignaled() { int pid = f_pcntl_fork(); if (pid == 0) { - exit(0x12); + _exit(0x12); } Variant status; f_pcntl_waitpid(0, ref(status)); @@ -185,7 +185,7 @@ bool TestExtProcess::test_pcntl_wifsignaled() { bool TestExtProcess::test_pcntl_wifstopped() { int pid = f_pcntl_fork(); if (pid == 0) { - exit(0x12); + _exit(0x12); } Variant status; f_pcntl_waitpid(0, ref(status)); @@ -196,7 +196,7 @@ bool TestExtProcess::test_pcntl_wifstopped() { bool TestExtProcess::test_pcntl_wstopsig() { int pid = f_pcntl_fork(); if (pid == 0) { - exit(0x12); + _exit(0x12); } Variant status; f_pcntl_waitpid(0, ref(status)); @@ -207,7 +207,7 @@ bool TestExtProcess::test_pcntl_wstopsig() { bool TestExtProcess::test_pcntl_wtermsig() { int pid = f_pcntl_fork(); if (pid == 0) { - exit(0x12); + _exit(0x12); } Variant status; f_pcntl_waitpid(0, ref(status)); diff --git a/hphp/test/test_ext_process.h b/hphp/test/ext/test_ext_process.h similarity index 98% rename from hphp/test/test_ext_process.h rename to hphp/test/ext/test_ext_process.h index b48f9f616..768c3b95b 100644 --- a/hphp/test/test_ext_process.h +++ b/hphp/test/ext/test_ext_process.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_reflection.cpp b/hphp/test/ext/test_ext_reflection.cpp similarity index 98% rename from hphp/test/test_ext_reflection.cpp rename to hphp/test/ext/test_ext_reflection.cpp index 7eab6bc8d..bb7ed53c2 100644 --- a/hphp/test/test_ext_reflection.cpp +++ b/hphp/test/ext/test_ext_reflection.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_reflection.h" +#include "hphp/test/ext/test_ext_reflection.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_reflection.h b/hphp/test/ext/test_ext_reflection.h similarity index 97% rename from hphp/test/test_ext_reflection.h rename to hphp/test/ext/test_ext_reflection.h index 28fe5b880..3fe823b84 100644 --- a/hphp/test/test_ext_reflection.h +++ b/hphp/test/ext/test_ext_reflection.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_server.cpp b/hphp/test/ext/test_ext_server.cpp similarity index 99% rename from hphp/test/test_ext_server.cpp rename to hphp/test/ext/test_ext_server.cpp index 7e8013387..d4f13cfd5 100644 --- a/hphp/test/test_ext_server.cpp +++ b/hphp/test/ext/test_ext_server.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_server.h" +#include "hphp/test/ext/test_ext_server.h" #include "hphp/runtime/ext/ext_server.h" #include "hphp/runtime/base/server/pagelet_server.h" #include "hphp/runtime/base/server/xbox_server.h" diff --git a/hphp/test/test_ext_server.h b/hphp/test/ext/test_ext_server.h similarity index 97% rename from hphp/test/test_ext_server.h rename to hphp/test/ext/test_ext_server.h index 41edd5bee..1b7e11c52 100644 --- a/hphp/test/test_ext_server.h +++ b/hphp/test/ext/test_ext_server.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_session.cpp b/hphp/test/ext/test_ext_session.cpp similarity index 98% rename from hphp/test/test_ext_session.cpp rename to hphp/test/ext/test_ext_session.cpp index 95c081ae6..d0482e0d6 100644 --- a/hphp/test/test_ext_session.cpp +++ b/hphp/test/ext/test_ext_session.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_session.h" +#include "hphp/test/ext/test_ext_session.h" #include "hphp/runtime/ext/ext_session.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_session.h b/hphp/test/ext/test_ext_session.h similarity index 98% rename from hphp/test/test_ext_session.h rename to hphp/test/ext/test_ext_session.h index 5250dcdfc..eaf3ecb0a 100644 --- a/hphp/test/test_ext_session.h +++ b/hphp/test/ext/test_ext_session.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_simplexml.cpp b/hphp/test/ext/test_ext_simplexml.cpp similarity index 98% rename from hphp/test/test_ext_simplexml.cpp rename to hphp/test/ext/test_ext_simplexml.cpp index 04d5061fa..fb8896ff6 100644 --- a/hphp/test/test_ext_simplexml.cpp +++ b/hphp/test/ext/test_ext_simplexml.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_simplexml.h" +#include "hphp/test/ext/test_ext_simplexml.h" #include "hphp/runtime/ext/ext_simplexml.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_simplexml.h b/hphp/test/ext/test_ext_simplexml.h similarity index 97% rename from hphp/test/test_ext_simplexml.h rename to hphp/test/ext/test_ext_simplexml.h index 360516561..2c6e9c668 100644 --- a/hphp/test/test_ext_simplexml.h +++ b/hphp/test/ext/test_ext_simplexml.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_soap.cpp b/hphp/test/ext/test_ext_soap.cpp similarity index 99% rename from hphp/test/test_ext_soap.cpp rename to hphp/test/ext/test_ext_soap.cpp index 166b46b2b..8d4e7825b 100644 --- a/hphp/test/test_ext_soap.cpp +++ b/hphp/test/ext/test_ext_soap.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_soap.h" +#include "hphp/test/ext/test_ext_soap.h" #include "hphp/runtime/ext/ext_output.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_soap.h b/hphp/test/ext/test_ext_soap.h similarity index 99% rename from hphp/test/test_ext_soap.h rename to hphp/test/ext/test_ext_soap.h index 52e78f0b0..166186e62 100644 --- a/hphp/test/test_ext_soap.h +++ b/hphp/test/ext/test_ext_soap.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_TEST_EXT_SOAP_H_ #define incl_HPHP_TEST_EXT_SOAP_H_ -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" #include "hphp/runtime/ext/ext_soap.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_socket.cpp b/hphp/test/ext/test_ext_socket.cpp similarity index 99% rename from hphp/test/test_ext_socket.cpp rename to hphp/test/ext/test_ext_socket.cpp index 1522f9f82..44a482a58 100644 --- a/hphp/test/test_ext_socket.cpp +++ b/hphp/test/ext/test_ext_socket.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_socket.h" +#include "hphp/test/ext/test_ext_socket.h" #include "hphp/runtime/ext/ext_socket.h" #include "hphp/runtime/ext/ext_network.h" diff --git a/hphp/test/test_ext_socket.h b/hphp/test/ext/test_ext_socket.h similarity index 98% rename from hphp/test/test_ext_socket.h rename to hphp/test/ext/test_ext_socket.h index 9e4c30930..be721de7c 100644 --- a/hphp/test/test_ext_socket.h +++ b/hphp/test/ext/test_ext_socket.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_spl.cpp b/hphp/test/ext/test_ext_spl.cpp similarity index 98% rename from hphp/test/test_ext_spl.cpp rename to hphp/test/ext/test_ext_spl.cpp index 0c835ed45..265d3254d 100644 --- a/hphp/test/test_ext_spl.cpp +++ b/hphp/test/ext/test_ext_spl.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_spl.h" +#include "hphp/test/ext/test_ext_spl.h" #include "hphp/runtime/ext/ext_spl.h" IMPLEMENT_SEP_EXTENSION_TEST(Spl); diff --git a/hphp/test/test_ext_spl.h b/hphp/test/ext/test_ext_spl.h similarity index 97% rename from hphp/test/test_ext_spl.h rename to hphp/test/ext/test_ext_spl.h index f3b2bcb5a..c85f20649 100644 --- a/hphp/test/test_ext_spl.h +++ b/hphp/test/ext/test_ext_spl.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_sqlite3.cpp b/hphp/test/ext/test_ext_sqlite3.cpp similarity index 99% rename from hphp/test/test_ext_sqlite3.cpp rename to hphp/test/ext/test_ext_sqlite3.cpp index bee2741c8..5fced8eed 100644 --- a/hphp/test/test_ext_sqlite3.cpp +++ b/hphp/test/ext/test_ext_sqlite3.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_sqlite3.h" +#include "hphp/test/ext/test_ext_sqlite3.h" #include "hphp/runtime/ext/ext_sqlite3.h" #include "hphp/runtime/ext/ext_file.h" diff --git a/hphp/test/test_ext_sqlite3.h b/hphp/test/ext/test_ext_sqlite3.h similarity index 97% rename from hphp/test/test_ext_sqlite3.h rename to hphp/test/ext/test_ext_sqlite3.h index 8e7565fbd..7211af99a 100644 --- a/hphp/test/test_ext_sqlite3.h +++ b/hphp/test/ext/test_ext_sqlite3.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_stream.cpp b/hphp/test/ext/test_ext_stream.cpp similarity index 99% rename from hphp/test/test_ext_stream.cpp rename to hphp/test/ext/test_ext_stream.cpp index 256aaeee1..9f45f95dc 100644 --- a/hphp/test/test_ext_stream.cpp +++ b/hphp/test/ext/test_ext_stream.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_stream.h" +#include "hphp/test/ext/test_ext_stream.h" #include "hphp/runtime/ext/ext_stream.h" #include "hphp/runtime/ext/ext_socket.h" #include "hphp/runtime/ext/ext_file.h" diff --git a/hphp/test/test_ext_stream.h b/hphp/test/ext/test_ext_stream.h similarity index 98% rename from hphp/test/test_ext_stream.h rename to hphp/test/ext/test_ext_stream.h index c8d7af7f3..5245f8147 100644 --- a/hphp/test/test_ext_stream.h +++ b/hphp/test/ext/test_ext_stream.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_string.cpp b/hphp/test/ext/test_ext_string.cpp similarity index 99% rename from hphp/test/test_ext_string.cpp rename to hphp/test/ext/test_ext_string.cpp index ab7c4c7a0..e415b27d0 100644 --- a/hphp/test/test_ext_string.cpp +++ b/hphp/test/ext/test_ext_string.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_string.h" +#include "hphp/test/ext/test_ext_string.h" #include "hphp/runtime/ext/ext_string.h" #include "hphp/runtime/ext/ext_fb.h" diff --git a/hphp/test/test_ext_string.h b/hphp/test/ext/test_ext_string.h similarity index 98% rename from hphp/test/test_ext_string.h rename to hphp/test/ext/test_ext_string.h index f3b5a9be7..0a575d045 100644 --- a/hphp/test/test_ext_string.h +++ b/hphp/test/ext/test_ext_string.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_thread.cpp b/hphp/test/ext/test_ext_thread.cpp similarity index 98% rename from hphp/test/test_ext_thread.cpp rename to hphp/test/ext/test_ext_thread.cpp index 3e533e0e6..40d7b2e7f 100644 --- a/hphp/test/test_ext_thread.cpp +++ b/hphp/test/ext/test_ext_thread.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_thread.h" +#include "hphp/test/ext/test_ext_thread.h" #include "hphp/runtime/ext/ext_thread.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_thread.h b/hphp/test/ext/test_ext_thread.h similarity index 97% rename from hphp/test/test_ext_thread.h rename to hphp/test/ext/test_ext_thread.h index 25b3b6d6f..9b51b7b14 100644 --- a/hphp/test/test_ext_thread.h +++ b/hphp/test/ext/test_ext_thread.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_thrift.cpp b/hphp/test/ext/test_ext_thrift.cpp similarity index 97% rename from hphp/test/test_ext_thrift.cpp rename to hphp/test/ext/test_ext_thrift.cpp index 1d7ebe711..2cf87d571 100644 --- a/hphp/test/test_ext_thrift.cpp +++ b/hphp/test/ext/test_ext_thrift.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_thrift.h" +#include "hphp/test/ext/test_ext_thrift.h" #include "hphp/runtime/ext/ext_thrift.h" IMPLEMENT_SEP_EXTENSION_TEST(Thrift); diff --git a/hphp/test/test_ext_thrift.h b/hphp/test/ext/test_ext_thrift.h similarity index 97% rename from hphp/test/test_ext_thrift.h rename to hphp/test/ext/test_ext_thrift.h index de137ffe9..4698866d4 100644 --- a/hphp/test/test_ext_thrift.h +++ b/hphp/test/ext/test_ext_thrift.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_url.cpp b/hphp/test/ext/test_ext_url.cpp similarity index 98% rename from hphp/test/test_ext_url.cpp rename to hphp/test/ext/test_ext_url.cpp index e31d314d7..bc526322a 100644 --- a/hphp/test/test_ext_url.cpp +++ b/hphp/test/ext/test_ext_url.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_url.h" +#include "hphp/test/ext/test_ext_url.h" #include "hphp/runtime/ext/ext_url.h" #include "hphp/system/lib/systemlib.h" @@ -76,7 +76,7 @@ bool TestExtUrl::test_get_meta_tags() { s_keywords("keywords"), s_description("description"), s_geo_position("geo_position"); - Array ret = f_get_meta_tags("test/test_get_meta_tags.html"); + Array ret = f_get_meta_tags("test/ext/test_get_meta_tags.html"); VS(ret.size(), 4); VS(ret[s_author], "name"); VS(ret[s_keywords], "php documentation"); diff --git a/hphp/test/test_ext_url.h b/hphp/test/ext/test_ext_url.h similarity index 97% rename from hphp/test/test_ext_url.h rename to hphp/test/ext/test_ext_url.h index 165f846ed..1f35f3721 100644 --- a/hphp/test/test_ext_url.h +++ b/hphp/test/ext/test_ext_url.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_variable.cpp b/hphp/test/ext/test_ext_variable.cpp similarity index 99% rename from hphp/test/test_ext_variable.cpp rename to hphp/test/ext/test_ext_variable.cpp index 196ad8017..757a59e57 100644 --- a/hphp/test/test_ext_variable.cpp +++ b/hphp/test/ext/test_ext_variable.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_variable.h" +#include "hphp/test/ext/test_ext_variable.h" #include "hphp/runtime/ext/ext_variable.h" #include "hphp/runtime/ext/ext_string.h" #include "hphp/system/lib/systemlib.h" diff --git a/hphp/test/test_ext_variable.h b/hphp/test/ext/test_ext_variable.h similarity index 98% rename from hphp/test/test_ext_variable.h rename to hphp/test/ext/test_ext_variable.h index 8aa8de196..dc017d3c8 100644 --- a/hphp/test/test_ext_variable.h +++ b/hphp/test/ext/test_ext_variable.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_xml.cpp b/hphp/test/ext/test_ext_xml.cpp similarity index 99% rename from hphp/test/test_ext_xml.cpp rename to hphp/test/ext/test_ext_xml.cpp index 6a5d6b5f1..cfbfae674 100644 --- a/hphp/test/test_ext_xml.cpp +++ b/hphp/test/ext/test_ext_xml.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_xml.h" +#include "hphp/test/ext/test_ext_xml.h" #include "hphp/runtime/ext/ext_xml.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_xml.h b/hphp/test/ext/test_ext_xml.h similarity index 98% rename from hphp/test/test_ext_xml.h rename to hphp/test/ext/test_ext_xml.h index 7c8497b13..40f959542 100644 --- a/hphp/test/test_ext_xml.h +++ b/hphp/test/ext/test_ext_xml.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_xmlreader.cpp b/hphp/test/ext/test_ext_xmlreader.cpp similarity index 97% rename from hphp/test/test_ext_xmlreader.cpp rename to hphp/test/ext/test_ext_xmlreader.cpp index 96c6ff123..3ecc0570b 100644 --- a/hphp/test/test_ext_xmlreader.cpp +++ b/hphp/test/ext/test_ext_xmlreader.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_xmlreader.h" +#include "hphp/test/ext/test_ext_xmlreader.h" #include "hphp/runtime/ext/ext_xmlreader.h" IMPLEMENT_SEP_EXTENSION_TEST(Xmlreader); diff --git a/hphp/test/test_ext_xmlreader.h b/hphp/test/ext/test_ext_xmlreader.h similarity index 97% rename from hphp/test/test_ext_xmlreader.h rename to hphp/test/ext/test_ext_xmlreader.h index 566cce8e7..60177ac9d 100644 --- a/hphp/test/test_ext_xmlreader.h +++ b/hphp/test/ext/test_ext_xmlreader.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_xmlwriter.cpp b/hphp/test/ext/test_ext_xmlwriter.cpp similarity index 99% rename from hphp/test/test_ext_xmlwriter.cpp rename to hphp/test/ext/test_ext_xmlwriter.cpp index 5f58c4cb2..169eec399 100644 --- a/hphp/test/test_ext_xmlwriter.cpp +++ b/hphp/test/ext/test_ext_xmlwriter.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_xmlwriter.h" +#include "hphp/test/ext/test_ext_xmlwriter.h" #include "hphp/runtime/ext/ext_xmlwriter.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_xmlwriter.h b/hphp/test/ext/test_ext_xmlwriter.h similarity index 98% rename from hphp/test/test_ext_xmlwriter.h rename to hphp/test/ext/test_ext_xmlwriter.h index 60f64c661..75a521bd6 100644 --- a/hphp/test/test_ext_xmlwriter.h +++ b/hphp/test/ext/test_ext_xmlwriter.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_ext_zlib.cpp b/hphp/test/ext/test_ext_zlib.cpp similarity index 94% rename from hphp/test/test_ext_zlib.cpp rename to hphp/test/ext/test_ext_zlib.cpp index a1f8af2f9..3ccc2b444 100644 --- a/hphp/test/test_ext_zlib.cpp +++ b/hphp/test/ext/test_ext_zlib.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_ext_zlib.h" +#include "hphp/test/ext/test_ext_zlib.h" #include "hphp/runtime/ext/ext_zlib.h" #include "hphp/runtime/ext/ext_file.h" #include "hphp/runtime/ext/ext_output.h" @@ -63,14 +63,14 @@ bool TestExtZlib::RunTests(const std::string &which) { bool TestExtZlib::test_readgzfile() { f_ob_start(); - f_readgzfile("test/test_ext_zlib.gz"); + f_readgzfile("test/ext/test_ext_zlib.gz"); VS(f_ob_get_clean(), "Testing Ext Zlib\n"); f_ob_end_clean(); return Count(true); } bool TestExtZlib::test_gzfile() { - VS(f_gzfile("test/test_ext_zlib.gz"), CREATE_VECTOR1("Testing Ext Zlib\n")); + VS(f_gzfile("test/ext/test_ext_zlib.gz"), CREATE_VECTOR1("Testing Ext Zlib\n")); return Count(true); } @@ -96,12 +96,12 @@ bool TestExtZlib::test_gzinflate() { bool TestExtZlib::test_gzencode() { Variant zipped = f_gzencode("testing gzencode"); - Variant f = f_fopen("test/test_ext_zlib.tmp", "w"); + Variant f = f_fopen("test/ext/test_ext_zlib.tmp", "w"); f_fwrite(f, zipped); f_fclose(f); f_ob_start(); - f_readgzfile("test/test_ext_zlib.tmp"); + f_readgzfile("test/ext/test_ext_zlib.tmp"); VS(f_ob_get_clean(), "testing gzencode"); f_ob_end_clean(); return Count(true); @@ -123,13 +123,13 @@ bool TestExtZlib::test_zlib_get_coding_type() { } bool TestExtZlib::test_gzopen() { - Variant f = f_gzopen("test/test_ext_zlib.tmp", "w"); + Variant f = f_gzopen("test/ext/test_ext_zlib.tmp", "w"); VERIFY(!same(f, false)); f_gzputs(f, "testing gzputs\n"); f_gzwrite(f, "testing gzwrite\n"); f_gzclose(f); - f = f_gzopen("test/test_ext_zlib.tmp", "r"); + f = f_gzopen("test/ext/test_ext_zlib.tmp", "r"); VS(f_gzread(f, 7), "testing"); VS(f_gzgetc(f), " "); VS(f_gzgets(f), "gzputs\n"); @@ -182,7 +182,7 @@ bool TestExtZlib::test_gzread() { } bool TestExtZlib::test_gzpassthru() { - Variant f = f_gzopen("test/test_ext_zlib.gz", "r"); + Variant f = f_gzopen("test/ext/test_ext_zlib.gz", "r"); f_ob_start(); f_gzpassthru(f); VS(f_ob_get_clean(), "Testing Ext Zlib\n"); diff --git a/hphp/test/test_ext_zlib.gz b/hphp/test/ext/test_ext_zlib.gz similarity index 100% rename from hphp/test/test_ext_zlib.gz rename to hphp/test/ext/test_ext_zlib.gz diff --git a/hphp/test/test_ext_zlib.h b/hphp/test/ext/test_ext_zlib.h similarity index 98% rename from hphp/test/test_ext_zlib.h rename to hphp/test/ext/test_ext_zlib.h index 3b70ccf9b..9761fbd07 100644 --- a/hphp/test/test_ext_zlib.h +++ b/hphp/test/ext/test_ext_zlib.h @@ -19,7 +19,7 @@ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< -#include "hphp/test/test_cpp_ext.h" +#include "hphp/test/ext/test_cpp_ext.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_get_meta_tags.html b/hphp/test/ext/test_get_meta_tags.html similarity index 100% rename from hphp/test/test_get_meta_tags.html rename to hphp/test/ext/test_get_meta_tags.html diff --git a/hphp/test/test_logger.cpp b/hphp/test/ext/test_logger.cpp similarity index 99% rename from hphp/test/test_logger.cpp rename to hphp/test/ext/test_logger.cpp index 5dca56bea..cc39eb977 100644 --- a/hphp/test/test_logger.cpp +++ b/hphp/test/ext/test_logger.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_logger.h" +#include "hphp/test/ext/test_logger.h" #include #include #include diff --git a/hphp/test/test_logger.h b/hphp/test/ext/test_logger.h similarity index 100% rename from hphp/test/test_logger.h rename to hphp/test/ext/test_logger.h diff --git a/hphp/test/test_parser.cpp b/hphp/test/ext/test_parser.cpp similarity index 98% rename from hphp/test/test_parser.cpp rename to hphp/test/ext/test_parser.cpp index 709cdc563..b8d88cd39 100644 --- a/hphp/test/test_parser.cpp +++ b/hphp/test/ext/test_parser.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_parser.h" +#include "hphp/test/ext/test_parser.h" #include "hphp/compiler/parser/parser.h" #include "hphp/compiler/code_generator.h" #include "hphp/compiler/statement/statement_list.h" diff --git a/hphp/test/test_parser.h b/hphp/test/ext/test_parser.h similarity index 98% rename from hphp/test/test_parser.h rename to hphp/test/ext/test_parser.h index fdcb3da00..5653e5883 100644 --- a/hphp/test/test_parser.h +++ b/hphp/test/ext/test_parser.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_TEST_PARSER_H_ #define incl_HPHP_TEST_PARSER_H_ -#include "hphp/test/test_base.h" +#include "hphp/test/ext/test_base.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_parser_expr.cpp b/hphp/test/ext/test_parser_expr.cpp similarity index 99% rename from hphp/test/test_parser_expr.cpp rename to hphp/test/ext/test_parser_expr.cpp index 6a6fe7ce2..a38f357ac 100644 --- a/hphp/test/test_parser_expr.cpp +++ b/hphp/test/ext/test_parser_expr.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_parser_expr.h" +#include "hphp/test/ext/test_parser_expr.h" #include "hphp/compiler/option.h" #include "hphp/util/parser/scanner.h" diff --git a/hphp/test/test_parser_expr.h b/hphp/test/ext/test_parser_expr.h similarity index 98% rename from hphp/test/test_parser_expr.h rename to hphp/test/ext/test_parser_expr.h index 107a23a67..595154253 100644 --- a/hphp/test/test_parser_expr.h +++ b/hphp/test/ext/test_parser_expr.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_TEST_PARSER_EXPR_H_ #define incl_HPHP_TEST_PARSER_EXPR_H_ -#include "hphp/test/test_parser.h" +#include "hphp/test/ext/test_parser.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_parser_stmt.cpp b/hphp/test/ext/test_parser_stmt.cpp similarity index 99% rename from hphp/test/test_parser_stmt.cpp rename to hphp/test/ext/test_parser_stmt.cpp index de524ace2..491a1d295 100644 --- a/hphp/test/test_parser_stmt.cpp +++ b/hphp/test/ext/test_parser_stmt.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_parser_stmt.h" +#include "hphp/test/ext/test_parser_stmt.h" #include "hphp/compiler/parser/parser.h" #include "hphp/compiler/code_generator.h" #include "hphp/compiler/statement/statement_list.h" diff --git a/hphp/test/test_parser_stmt.h b/hphp/test/ext/test_parser_stmt.h similarity index 98% rename from hphp/test/test_parser_stmt.h rename to hphp/test/ext/test_parser_stmt.h index c26515843..7fcd3400a 100644 --- a/hphp/test/test_parser_stmt.h +++ b/hphp/test/ext/test_parser_stmt.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_TEST_PARSER_STMT_H_ #define incl_HPHP_TEST_PARSER_STMT_H_ -#include "hphp/test/test_parser.h" +#include "hphp/test/ext/test_parser.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_server.cpp b/hphp/test/ext/test_server.cpp similarity index 99% rename from hphp/test/test_server.cpp rename to hphp/test/ext/test_server.cpp index 37a73a726..cbe457293 100644 --- a/hphp/test/test_server.cpp +++ b/hphp/test/ext/test_server.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_server.h" +#include "hphp/test/ext/test_server.h" #include "hphp/compiler/parser/parser.h" #include "hphp/compiler/builtin_symbols.h" #include "hphp/compiler/code_generator.h" diff --git a/hphp/test/test_server.h b/hphp/test/ext/test_server.h similarity index 99% rename from hphp/test/test_server.h rename to hphp/test/ext/test_server.h index abd85b808..1f910d9c0 100644 --- a/hphp/test/test_server.h +++ b/hphp/test/ext/test_server.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_TEST_SERVER_H_ #define incl_HPHP_TEST_SERVER_H_ -#include "hphp/test/test_code_run.h" +#include "hphp/test/ext/test_code_run.h" #include "hphp/runtime/base/complex_types.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_util.cpp b/hphp/test/ext/test_util.cpp similarity index 99% rename from hphp/test/test_util.cpp rename to hphp/test/ext/test_util.cpp index 2ad22bf9e..5063eb6f5 100644 --- a/hphp/test/test_util.cpp +++ b/hphp/test/ext/test_util.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/test/test_util.h" +#include "hphp/test/ext/test_util.h" #include "hphp/util/logger.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/shared/shared_string.h" diff --git a/hphp/test/test_util.h b/hphp/test/ext/test_util.h similarity index 97% rename from hphp/test/test_util.h rename to hphp/test/ext/test_util.h index 9acbbad43..2c2ae7927 100644 --- a/hphp/test/test_util.h +++ b/hphp/test/ext/test_util.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_TEST_UTIL_H_ #define incl_HPHP_TEST_UTIL_H_ -#include "hphp/test/test_base.h" +#include "hphp/test/ext/test_base.h" #include "hphp/util/base.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test_base_suite.inc b/hphp/test/test_base_suite.inc deleted file mode 100644 index 22f36c10e..000000000 --- a/hphp/test/test_base_suite.inc +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/hphp/tools/run_test_binary.sh b/hphp/tools/run_test_binary.sh index 6432b3a25..d8c9ce1bf 100755 --- a/hphp/tools/run_test_binary.sh +++ b/hphp/tools/run_test_binary.sh @@ -6,4 +6,4 @@ # HPHP_HOME=$(git rev-parse --show-toplevel) : ${FBMAKE_BIN_ROOT=_bin} -cd $HPHP_HOME/hphp && $HPHP_HOME/$FBMAKE_BIN_ROOT/hphp/test/test "$1" "$2" "$3" +cd $HPHP_HOME/hphp && $HPHP_HOME/$FBMAKE_BIN_ROOT/hphp/test/ext/test "$1" "$2" "$3"