Permalink
Browse files

delete most PHP in C++

Sadly I can't get TestDebugger, TestServer, TestExt, QuickTests, or TestPerformance as they are all unsuported by verify. Someday.
  • Loading branch information...
1 parent 53d1db1 commit eca135cb31b54c4e69fc09f73c8756846f18b935 @ptarjan ptarjan committed with sgolemon Apr 21, 2013
Showing with 9 additions and 33,358 deletions.
  1. +0 −1 hphp/test/quick/decrefstack1.php
  2. +6 −33 hphp/test/test_all.cpp
  3. +1 −33,081 hphp/test/test_code_run.cpp
  4. +1 −240 hphp/test/test_code_run.h
  5. +1 −3 hphp/test/test_server.cpp
@@ -1,5 +1,4 @@
<?php
-# test_code_run.cpp:29360
class MyDerivedClass {
public function __construct() {
@@ -24,16 +24,6 @@ void Test::RunTestsImpl(bool &allPassed, std::string &suite,
std::string &which, std::string &set) {
// individual test suites
s_suite = suite;
- if (suite == "TestCodeRun") {
- RUN_TESTSUITE(TestCodeRun);
- return;
- }
- if (suite == "TestCodeRunStatic") {
- suite = "TestCodeRun";
- TestCodeRun::FastMode = false;
- RUN_TESTSUITE(TestCodeRun);
- return;
- }
if (suite == "TestDebugger" || suite == "TestDebuggerJit") {
if (suite == "TestDebuggerJit") {
RuntimeOption::EvalJit = true;
@@ -44,30 +34,13 @@ void Test::RunTestsImpl(bool &allPassed, std::string &suite,
RUN_TESTSUITE(TestDebugger);
return;
}
-
- if (suite == "TestCodeRunVM" || suite == "TestCodeRunRepo") {
- suite = "TestCodeRun";
- Option::EnableEval = Option::FullEval;
- RuntimeOption::EvalJit = false;
- RUN_TESTSUITE(TestCodeRun);
- return;
- }
- if (suite == "TestCodeRunJit" || suite == "TestCodeRunRepoJit" ||
- suite == "TestCodeRunJitIR" || suite == "TestCodeRunRepoJitIR") {
- suite = "TestCodeRun";
- Option::EnableEval = Option::FullEval;
- RuntimeOption::EvalJit = true;
- if (suite == "TestCodeRunJitIR" || suite == "TestCodeRunRepoJitIR") {
- RuntimeOption::EvalJitUseIR = true;
- }
- RUN_TESTSUITE(TestCodeRun);
- return;
- }
if (suite == "TestServer") {
Option::EnableEval = Option::FullEval;
RUN_TESTSUITE(TestServer);
return;
}
+
+ // set based tests with many suites
if (set == "TestUnit") {
RUN_TESTSUITE(TestParserExpr);
RUN_TESTSUITE(TestParserStmt);
@@ -76,11 +49,11 @@ void Test::RunTestsImpl(bool &allPassed, std::string &suite,
RUN_TESTSUITE(TestCppBase);
return;
}
-
+ if (set == "TestExt") {
// complete extension tests
#include "test_ext.inc"
-
- if (suite == "" && set != "NoCodeRun" && set != "TestExt") {
- RUN_TESTSUITE(TestCodeRun);
+ return;
}
+
+ printf("Unknown suite: %s\n", suite.c_str());
}
Oops, something went wrong.

0 comments on commit eca135c

Please sign in to comment.