com pftt2: Anatol: updating TEST_BIT8 for mbstring PH PT failure: conf/symfony.groovy conf/zend.groovy
src/com/mostc/pftt/model/core/PhptTestCase.java

Commit: 197a11e05c9c3191026a3072bd6762f53f7c3566 Author: Matt Ficken <v-mafick@microsoft.com> Tue, 24 Sep 2013 11:16:13 -0700 Parents: 602c823016582d3f1aa28a898f4a8a35476951e6 Branches: master Link: http://git.php.net/?p=pftt2.git;a=commitdiff;h=197a11e05c9c3191026a3072bd6762f53f7c3566 Log: Anatol: updating TEST_BIT8 for mbstring PHPT failure Former-commit-id: cb0c13ead222dbbc76a1d763dbb107c701749a93 Changed paths: M conf/symfony.groovy M conf/zend.groovy M src/com/mostc/pftt/model/core/PhptTestCase.java Diff: diff --git a/conf/symfony.groovy b/conf/symfony.groovy index fb80097..60c8afc 100644 --- a/conf/symfony.groovy +++ b/conf/symfony.groovy @@ -20,14 +20,12 @@ class SymfonyPhpUnitTestPack extends OptionalDatabasePhpUnitSourceTestPack { } @Override - protected String getSourceRoot(AHost host) { + protected String getSourceRoot(ConsoleManager cm, AHost host) { + ensureAppDecompressed(cm, host, "symfony-standard..7z") + return host.getPfttDir()+"/cache/working/symfony-standard"; } - @Override - protected Object clone() throws CloneNotSupportedException { - // TODO Auto-generated method stub - return super.clone(); - } + public String[][] getNonThreadSafeTestFileNames() { return [ ["Symfony/Component/HttpFoundation"], @@ -39,6 +37,7 @@ class SymfonyPhpUnitTestPack extends OptionalDatabasePhpUnitSourceTestPack { @Override protected boolean openAfterInstall(ConsoleManager cm, AHost host) throws Exception { + // 1. do initial install (if not done already) if (!host.exists(getRoot()+"/vendor")) { // TODO modified require_once __DIR__ in C:\php-sdk\PFTT\current\cache\working\symfony-standard\vendor\symfony\symfony\vendor\symfony\symfony\autoload.php.dist @@ -63,7 +62,7 @@ class SymfonyPhpUnitTestPack extends OptionalDatabasePhpUnitSourceTestPack { AHost.HALF_HOUR, env, // where cwd is symfony-standard - getSourceRoot(host) + getSourceRoot(cm, host) ); } } else { diff --git a/conf/zend.groovy b/conf/zend.groovy index ba8b1e6..ef8e0ab 100644 --- a/conf/zend.groovy +++ b/conf/zend.groovy @@ -11,7 +11,7 @@ class ZendFrameworkPhpUnitTestPack extends PhpUnitSourceTestPack { } @Override - protected String getSourceRoot(AHost host) { + protected String getSourceRoot(ConsoleManager cm, AHost host) { return host.getPfttDir()+"/cache/working/zend"; } diff --git a/src/com/mostc/pftt/model/core/PhptTestCase.java b/src/com/mostc/pftt/model/core/PhptTestCase.java index cc06a13..63e65cc 100644 --- a/src/com/mostc/pftt/model/core/PhptTestCase.java +++ b/src/com/mostc/pftt/model/core/PhptTestCase.java @@ -945,6 +945,9 @@ public class PhptTestCase extends TestCase { return isNon8BitCharset(getName()); } + // SOMEDAY put this in a test-pack configuration or default configuration + // so that info specific to a specific test-pack isn't hard-coded here, instead configure it. + // makes it easy to change, makes it more flexible for different test-packs. public static boolean isNon8BitCharset(String test_name) { // XXX use a Trie to speedup checking for ( String tc : TESTS_BIT8) { @@ -1016,6 +1019,7 @@ public class PhptTestCase extends TestCase { "ext/standard/tests/general_functions/parse_ini_basic.phpt" // Apache }; static final String[] TESTS_BIT8 = new String[] { + "ext/mbstring/tests/mb_decode_numericentity.phpt", "ext/intl/tests/locale_get_display_language.phpt", "ext/intl/tests/locale_get_display_name2.phpt", "ext/intl/tests/locale_get_display_region2.phpt",