Commit: 75f37baaa571158b6f43f504af9caaf76652bec2
Author: Matt Ficken <v-maf...@microsoft.com> Tue, 24 Sep 2013
11:15:24 -0700
Parents: 67e9892364a10798fb9ef2498dd039a61898866d
Branches: master
Link:
http://git.php.net/?p=pftt2.git;a=commitdiff;h=75f37baaa571158b6f43f504af9caaf76652bec2
Log:
updating application test-packs
Changed paths:
A app/CodeIgniter.7z
D app/CodeIgniter_2.1.3.7z
D app/Joomla_3.0.2-Stable-Full_Package.7z
A app/Mambo.7z
D app/MamboV4.6.1.7z
D app/Pligg_CMS
A app/Pligg_CMS.7z
A app/SemanticMediaWiki.7z
D app/SemanticMediaWiki1.8.7z
D app/SugarCE-6.5.8.7z
A app/SugarCE.7z
D app/appleseedproj-appleseed-faf8b52.7z
A app/appleseedproj.7z
D app/atrium-1-1.7z
A app/atrium.7z
D app/azure-sdk-for-php-master.7z
A app/azure-sdk-for-php.7z
D app/cakephp-cakephp-2.3.1-0-g48149cb.7z
A app/cakephp.7z
A app/composer.7z
D app/dokuwiki-2012-10-13.7z
A app/dokuwiki.7z
D app/drupal-7.18.7z
A app/drupal-8.7z
D app/drupal-commerce-7.x-1.4.7z
A app/drupal-commerce.7z
D app/elgg-1.8.11.7z
A app/elgg.7z
A app/fengoffice.7z
D app/fengoffice_2.3.7z
D app/gallery-3.0.4.7z
A app/gallery.7z
A app/joomla-platform.7z
A app/limesurvey.7z
D app/limesurvey200plus-build121220.7z
D app/magento-1.7.0.2.7z
D app/magento-sample-data-1.6.1.0.7z
A app/magento-sample-data.7z
A app/magento.7z
D app/mantisbt-1.2.14.7z
A app/mantisbt.7z
D app/mediawiki-1.20.2.7z
A app/mediawiki.7z
D app/moodle-2.4.7z
A app/moodle.7z
A app/pChart.7z
D app/pChart2.1.3.7z
D app/phorum-5.2.19.7z
A app/phorum.7z
D app/phpBB-3.0.11.7z
D app/phpFormGen-php-2.09c.7z
A app/phpFormGen.7z
D app/phpMyAdmin-3.4.9-all-languages.7z
D app/phpPgAdmin-5.0.3.7z
A app/phpPgAdmin.7z
D app/phpTickets-1_1_0.7z
A app/phpTickets.7z
A app/phpbb3.7z
A app/phpdocx.7z
D app/phpdocx_community.7z
D app/phplist-2.10.19.7z
A app/phplist.7z
D app/phpmotion-3.5.7z
A app/phpmotion.7z
A app/phpmyadmin.7z
D app/piwik-latest.7z
A app/piwik.7z
D app/punbb-1.4.2.7z
A app/punbb.7z
D app/squirrelmail-webmail-1.4.22.7z
A app/squirrelmail-webmail.7z
D app/symfony-standard-2.1.8.7z
A app/symfony-standard.7z
D app/tiki-10.0.7z
A app/tiki.7z
D app/typo3-6.0.0.7z
A app/typo3.7z
D app/webgrind-master.7z
A app/webgrind.7z
D app/wordpress-3.5.1.7z
M app/wordpress-tests.7z
A app/wordpress.7z
D app/xoops-2.5.5.7z
A app/xoops.7z
D app/xos-3.5.7z
A app/xos.7z
M conf/app/appleseed.groovy
M conf/app/azure_sdk.groovy
M conf/app/drupal.groovy
M conf/app/joomla.groovy
M conf/app/mediawiki.groovy
M conf/app/phpbb3.groovy
M conf/app/phpmyadmin.groovy
M conf/app/semantic_mediawiki.groovy
M conf/app/typo3.groovy
M conf/app/wordpress.groovy
M conf/cake_php.groovy
M src/com/mostc/pftt/host/AHost.java
M src/com/mostc/pftt/model/app/PhpUnitSourceTestPack.java
diff --git a/app/CodeIgniter.7z b/app/CodeIgniter.7z
new file mode 100644
index 0000000..32f7eab
Binary files /dev/null and b/app/CodeIgniter.7z differ
diff --git a/app/CodeIgniter_2.1.3.7z b/app/CodeIgniter_2.1.3.7z
deleted file mode 100644
index 32f7eab..0000000
Binary files a/app/CodeIgniter_2.1.3.7z and /dev/null differ
diff --git a/app/Joomla_3.0.2-Stable-Full_Package.7z
b/app/Joomla_3.0.2-Stable-Full_Package.7z
deleted file mode 100644
index 4189748..0000000
Binary files a/app/Joomla_3.0.2-Stable-Full_Package.7z and /dev/null differ
diff --git a/app/Mambo.7z b/app/Mambo.7z
new file mode 100644
index 0000000..96a8fc5
Binary files /dev/null and b/app/Mambo.7z differ
diff --git a/app/MamboV4.6.1.7z b/app/MamboV4.6.1.7z
deleted file mode 100644
index 96a8fc5..0000000
Binary files a/app/MamboV4.6.1.7z and /dev/null differ
diff --git a/app/Pligg_CMS 1.2.2.7z b/app/Pligg_CMS 1.2.2.7z
deleted file mode 100644
index 518544b..0000000
Binary files a/app/Pligg_CMS 1.2.2.7z and /dev/null differ
diff --git a/app/Pligg_CMS.7z b/app/Pligg_CMS.7z
new file mode 100644
index 0000000..518544b
Binary files /dev/null and b/app/Pligg_CMS.7z differ
diff --git a/app/SemanticMediaWiki.7z b/app/SemanticMediaWiki.7z
new file mode 100644
index 0000000..11daf82
Binary files /dev/null and b/app/SemanticMediaWiki.7z differ
diff --git a/app/SemanticMediaWiki1.8.7z b/app/SemanticMediaWiki1.8.7z
deleted file mode 100644
index 2ded692..0000000
Binary files a/app/SemanticMediaWiki1.8.7z and /dev/null differ
diff --git a/app/SugarCE-6.5.8.7z b/app/SugarCE-6.5.8.7z
deleted file mode 100644
index 8a36483..0000000
Binary files a/app/SugarCE-6.5.8.7z and /dev/null differ
diff --git a/app/SugarCE.7z b/app/SugarCE.7z
new file mode 100644
index 0000000..8a36483
Binary files /dev/null and b/app/SugarCE.7z differ
diff --git a/app/appleseedproj-appleseed-faf8b52.7z
b/app/appleseedproj-appleseed-faf8b52.7z
deleted file mode 100644
index 9df33e6..0000000
Binary files a/app/appleseedproj-appleseed-faf8b52.7z and /dev/null differ
diff --git a/app/appleseedproj.7z b/app/appleseedproj.7z
new file mode 100644
index 0000000..9df33e6
Binary files /dev/null and b/app/appleseedproj.7z differ
diff --git a/app/atrium-1-1.7z b/app/atrium-1-1.7z
deleted file mode 100644
index e70a3f2..0000000
Binary files a/app/atrium-1-1.7z and /dev/null differ
diff --git a/app/atrium.7z b/app/atrium.7z
new file mode 100644
index 0000000..e70a3f2
Binary files /dev/null and b/app/atrium.7z differ
diff --git a/app/azure-sdk-for-php-master.7z b/app/azure-sdk-for-php-master.7z
deleted file mode 100644
index 642e47b..0000000
Binary files a/app/azure-sdk-for-php-master.7z and /dev/null differ
diff --git a/app/azure-sdk-for-php.7z b/app/azure-sdk-for-php.7z
new file mode 100644
index 0000000..4573f42
Binary files /dev/null and b/app/azure-sdk-for-php.7z differ
diff --git a/app/cakephp-cakephp-2.3.1-0-g48149cb.7z
b/app/cakephp-cakephp-2.3.1-0-g48149cb.7z
deleted file mode 100644
index 29793a2..0000000
Binary files a/app/cakephp-cakephp-2.3.1-0-g48149cb.7z and /dev/null differ
diff --git a/app/cakephp.7z b/app/cakephp.7z
new file mode 100644
index 0000000..29793a2
Binary files /dev/null and b/app/cakephp.7z differ
diff --git a/app/composer.7z b/app/composer.7z
new file mode 100644
index 0000000..36eb7bb
Binary files /dev/null and b/app/composer.7z differ
diff --git a/app/dokuwiki-2012-10-13.7z b/app/dokuwiki-2012-10-13.7z
deleted file mode 100644
index d966312..0000000
Binary files a/app/dokuwiki-2012-10-13.7z and /dev/null differ
diff --git a/app/dokuwiki.7z b/app/dokuwiki.7z
new file mode 100644
index 0000000..d966312
Binary files /dev/null and b/app/dokuwiki.7z differ
diff --git a/app/drupal-7.18.7z b/app/drupal-7.18.7z
deleted file mode 100644
index 992cccb..0000000
Binary files a/app/drupal-7.18.7z and /dev/null differ
diff --git a/app/drupal-8.7z b/app/drupal-8.7z
new file mode 100644
index 0000000..ff18b13
Binary files /dev/null and b/app/drupal-8.7z differ
diff --git a/app/drupal-commerce-7.x-1.4.7z b/app/drupal-commerce-7.x-1.4.7z
deleted file mode 100644
index b03777a..0000000
Binary files a/app/drupal-commerce-7.x-1.4.7z and /dev/null differ
diff --git a/app/drupal-commerce.7z b/app/drupal-commerce.7z
new file mode 100644
index 0000000..b03777a
Binary files /dev/null and b/app/drupal-commerce.7z differ
diff --git a/app/elgg-1.8.11.7z b/app/elgg-1.8.11.7z
deleted file mode 100644
index e2b29f9..0000000
Binary files a/app/elgg-1.8.11.7z and /dev/null differ
diff --git a/app/elgg.7z b/app/elgg.7z
new file mode 100644
index 0000000..e2b29f9
Binary files /dev/null and b/app/elgg.7z differ
diff --git a/app/fengoffice.7z b/app/fengoffice.7z
new file mode 100644
index 0000000..1a90b66
Binary files /dev/null and b/app/fengoffice.7z differ
diff --git a/app/fengoffice_2.3.7z b/app/fengoffice_2.3.7z
deleted file mode 100644
index 1a90b66..0000000
Binary files a/app/fengoffice_2.3.7z and /dev/null differ
diff --git a/app/gallery-3.0.4.7z b/app/gallery-3.0.4.7z
deleted file mode 100644
index 4297177..0000000
Binary files a/app/gallery-3.0.4.7z and /dev/null differ
diff --git a/app/gallery.7z b/app/gallery.7z
new file mode 100644
index 0000000..4297177
Binary files /dev/null and b/app/gallery.7z differ
diff --git a/app/joomla-platform.7z b/app/joomla-platform.7z
new file mode 100644
index 0000000..91aad9f
Binary files /dev/null and b/app/joomla-platform.7z differ
diff --git a/app/limesurvey.7z b/app/limesurvey.7z
new file mode 100644
index 0000000..c3323e6
Binary files /dev/null and b/app/limesurvey.7z differ
diff --git a/app/limesurvey200plus-build121220.7z
b/app/limesurvey200plus-build121220.7z
deleted file mode 100644
index c3323e6..0000000
Binary files a/app/limesurvey200plus-build121220.7z and /dev/null differ
diff --git a/app/magento-1.7.0.2.7z b/app/magento-1.7.0.2.7z
deleted file mode 100644
index 2b81000..0000000
Binary files a/app/magento-1.7.0.2.7z and /dev/null differ
diff --git a/app/magento-sample-data-1.6.1.0.7z
b/app/magento-sample-data-1.6.1.0.7z
deleted file mode 100644
index 3df647e..0000000
Binary files a/app/magento-sample-data-1.6.1.0.7z and /dev/null differ
diff --git a/app/magento-sample-data.7z b/app/magento-sample-data.7z
new file mode 100644
index 0000000..3df647e
Binary files /dev/null and b/app/magento-sample-data.7z differ
diff --git a/app/magento.7z b/app/magento.7z
new file mode 100644
index 0000000..2b81000
Binary files /dev/null and b/app/magento.7z differ
diff --git a/app/mantisbt-1.2.14.7z b/app/mantisbt-1.2.14.7z
deleted file mode 100644
index 6ec4259..0000000
Binary files a/app/mantisbt-1.2.14.7z and /dev/null differ
diff --git a/app/mantisbt.7z b/app/mantisbt.7z
new file mode 100644
index 0000000..6ec4259
Binary files /dev/null and b/app/mantisbt.7z differ
diff --git a/app/mediawiki-1.20.2.7z b/app/mediawiki-1.20.2.7z
deleted file mode 100644
index f368df7..0000000
Binary files a/app/mediawiki-1.20.2.7z and /dev/null differ
diff --git a/app/mediawiki.7z b/app/mediawiki.7z
new file mode 100644
index 0000000..644a00c
Binary files /dev/null and b/app/mediawiki.7z differ
diff --git a/app/moodle-2.4.7z b/app/moodle-2.4.7z
deleted file mode 100644
index 2cfecbd..0000000
Binary files a/app/moodle-2.4.7z and /dev/null differ
diff --git a/app/moodle.7z b/app/moodle.7z
new file mode 100644
index 0000000..2cfecbd
Binary files /dev/null and b/app/moodle.7z differ
diff --git a/app/pChart.7z b/app/pChart.7z
new file mode 100644
index 0000000..210eb64
Binary files /dev/null and b/app/pChart.7z differ
diff --git a/app/pChart2.1.3.7z b/app/pChart2.1.3.7z
deleted file mode 100644
index 210eb64..0000000
Binary files a/app/pChart2.1.3.7z and /dev/null differ
diff --git a/app/phorum-5.2.19.7z b/app/phorum-5.2.19.7z
deleted file mode 100644
index af91337..0000000
Binary files a/app/phorum-5.2.19.7z and /dev/null differ
diff --git a/app/phorum.7z b/app/phorum.7z
new file mode 100644
index 0000000..af91337
Binary files /dev/null and b/app/phorum.7z differ
diff --git a/app/phpBB-3.0.11.7z b/app/phpBB-3.0.11.7z
deleted file mode 100644
index 60c2c9a..0000000
Binary files a/app/phpBB-3.0.11.7z and /dev/null differ
diff --git a/app/phpFormGen-php-2.09c.7z b/app/phpFormGen-php-2.09c.7z
deleted file mode 100644
index d402252..0000000
Binary files a/app/phpFormGen-php-2.09c.7z and /dev/null differ
diff --git a/app/phpFormGen.7z b/app/phpFormGen.7z
new file mode 100644
index 0000000..d402252
Binary files /dev/null and b/app/phpFormGen.7z differ
diff --git a/app/phpMyAdmin-3.4.9-all-languages.7z
b/app/phpMyAdmin-3.4.9-all-languages.7z
deleted file mode 100644
index 18723e4..0000000
Binary files a/app/phpMyAdmin-3.4.9-all-languages.7z and /dev/null differ
diff --git a/app/phpPgAdmin-5.0.3.7z b/app/phpPgAdmin-5.0.3.7z
deleted file mode 100644
index a808bf0..0000000
Binary files a/app/phpPgAdmin-5.0.3.7z and /dev/null differ
diff --git a/app/phpPgAdmin.7z b/app/phpPgAdmin.7z
new file mode 100644
index 0000000..a808bf0
Binary files /dev/null and b/app/phpPgAdmin.7z differ
diff --git a/app/phpTickets-1_1_0.7z b/app/phpTickets-1_1_0.7z
deleted file mode 100644
index 2c6cf6e..0000000
Binary files a/app/phpTickets-1_1_0.7z and /dev/null differ
diff --git a/app/phpTickets.7z b/app/phpTickets.7z
new file mode 100644
index 0000000..2c6cf6e
Binary files /dev/null and b/app/phpTickets.7z differ
diff --git a/app/phpbb3.7z b/app/phpbb3.7z
new file mode 100644
index 0000000..efb206d
Binary files /dev/null and b/app/phpbb3.7z differ
diff --git a/app/phpdocx.7z b/app/phpdocx.7z
new file mode 100644
index 0000000..7d4369a
Binary files /dev/null and b/app/phpdocx.7z differ
diff --git a/app/phpdocx_community.7z b/app/phpdocx_community.7z
deleted file mode 100644
index 7d4369a..0000000
Binary files a/app/phpdocx_community.7z and /dev/null differ
diff --git a/app/phplist-2.10.19.7z b/app/phplist-2.10.19.7z
deleted file mode 100644
index 7fd9805..0000000
Binary files a/app/phplist-2.10.19.7z and /dev/null differ
diff --git a/app/phplist.7z b/app/phplist.7z
new file mode 100644
index 0000000..7fd9805
Binary files /dev/null and b/app/phplist.7z differ
diff --git a/app/phpmotion-3.5.7z b/app/phpmotion-3.5.7z
deleted file mode 100644
index 8fdf0aa..0000000
Binary files a/app/phpmotion-3.5.7z and /dev/null differ
diff --git a/app/phpmotion.7z b/app/phpmotion.7z
new file mode 100644
index 0000000..8fdf0aa
Binary files /dev/null and b/app/phpmotion.7z differ
diff --git a/app/phpmyadmin.7z b/app/phpmyadmin.7z
new file mode 100644
index 0000000..589aafc
Binary files /dev/null and b/app/phpmyadmin.7z differ
diff --git a/app/piwik-latest.7z b/app/piwik-latest.7z
deleted file mode 100644
index 4084b42..0000000
Binary files a/app/piwik-latest.7z and /dev/null differ
diff --git a/app/piwik.7z b/app/piwik.7z
new file mode 100644
index 0000000..4084b42
Binary files /dev/null and b/app/piwik.7z differ
diff --git a/app/punbb-1.4.2.7z b/app/punbb-1.4.2.7z
deleted file mode 100644
index 60717a5..0000000
Binary files a/app/punbb-1.4.2.7z and /dev/null differ
diff --git a/app/punbb.7z b/app/punbb.7z
new file mode 100644
index 0000000..60717a5
Binary files /dev/null and b/app/punbb.7z differ
diff --git a/app/squirrelmail-webmail-1.4.22.7z
b/app/squirrelmail-webmail-1.4.22.7z
deleted file mode 100644
index b192b85..0000000
Binary files a/app/squirrelmail-webmail-1.4.22.7z and /dev/null differ
diff --git a/app/squirrelmail-webmail.7z b/app/squirrelmail-webmail.7z
new file mode 100644
index 0000000..b192b85
Binary files /dev/null and b/app/squirrelmail-webmail.7z differ
diff --git a/app/symfony-standard-2.1.8.7z b/app/symfony-standard-2.1.8.7z
deleted file mode 100644
index d9cd08e..0000000
Binary files a/app/symfony-standard-2.1.8.7z and /dev/null differ
diff --git a/app/symfony-standard.7z b/app/symfony-standard.7z
new file mode 100644
index 0000000..5f46041
Binary files /dev/null and b/app/symfony-standard.7z differ
diff --git a/app/tiki-10.0.7z b/app/tiki-10.0.7z
deleted file mode 100644
index 9c88fd3..0000000
Binary files a/app/tiki-10.0.7z and /dev/null differ
diff --git a/app/tiki.7z b/app/tiki.7z
new file mode 100644
index 0000000..9c88fd3
Binary files /dev/null and b/app/tiki.7z differ
diff --git a/app/typo3-6.0.0.7z b/app/typo3-6.0.0.7z
deleted file mode 100644
index 0dbe004..0000000
Binary files a/app/typo3-6.0.0.7z and /dev/null differ
diff --git a/app/typo3.7z b/app/typo3.7z
new file mode 100644
index 0000000..0dbe004
Binary files /dev/null and b/app/typo3.7z differ
diff --git a/app/webgrind-master.7z b/app/webgrind-master.7z
deleted file mode 100644
index d22faa3..0000000
Binary files a/app/webgrind-master.7z and /dev/null differ
diff --git a/app/webgrind.7z b/app/webgrind.7z
new file mode 100644
index 0000000..d22faa3
Binary files /dev/null and b/app/webgrind.7z differ
diff --git a/app/wordpress-3.5.1.7z b/app/wordpress-3.5.1.7z
deleted file mode 100644
index 7493efb..0000000
Binary files a/app/wordpress-3.5.1.7z and /dev/null differ
diff --git a/app/wordpress-tests.7z b/app/wordpress-tests.7z
index 17f4adb..043a205 100644
Binary files a/app/wordpress-tests.7z and b/app/wordpress-tests.7z differ
diff --git a/app/wordpress.7z b/app/wordpress.7z
new file mode 100644
index 0000000..7493efb
Binary files /dev/null and b/app/wordpress.7z differ
diff --git a/app/xoops-2.5.5.7z b/app/xoops-2.5.5.7z
deleted file mode 100644
index e1e8cf8..0000000
Binary files a/app/xoops-2.5.5.7z and /dev/null differ
diff --git a/app/xoops.7z b/app/xoops.7z
new file mode 100644
index 0000000..e1e8cf8
Binary files /dev/null and b/app/xoops.7z differ
diff --git a/app/xos-3.5.7z b/app/xos-3.5.7z
deleted file mode 100644
index ae797ac..0000000
Binary files a/app/xos-3.5.7z and /dev/null differ
diff --git a/app/xos.7z b/app/xos.7z
new file mode 100644
index 0000000..ae797ac
Binary files /dev/null and b/app/xos.7z differ
diff --git a/conf/app/appleseed.groovy b/conf/app/appleseed.groovy
index 9559cae..c4af9a0 100644
--- a/conf/app/appleseed.groovy
+++ b/conf/app/appleseed.groovy
@@ -19,7 +19,7 @@ class AppleseedPhpUnitTestPack extends PhpUnitSourceTestPack {
}
@Override
- protected String getSourceRoot(AHost host) {
+ protected String getSourceRoot(ConsoleManager cm, AHost host) {
return host.getPfttDir()+"/cache/working/Appleseed";
}
diff --git a/conf/app/azure_sdk.groovy b/conf/app/azure_sdk.groovy
index 86decb9..2fd6d43 100644
--- a/conf/app/azure_sdk.groovy
+++ b/conf/app/azure_sdk.groovy
@@ -15,7 +15,9 @@ class AzureSDKPhpUnitTestPack extends PhpUnitSourceTestPack {
}
@Override
- protected String getSourceRoot(AHost host) {
+ protected String getSourceRoot(ConsoleManager cm, AHost host) {
+ ensureAppDecompressed(cm, host, "azure-sdk-for-php.7z")
+
return host.getPfttDir()+"/cache/working/azure-sdk-for-php";
}
diff --git a/conf/app/drupal.groovy b/conf/app/drupal.groovy
index 0a16071..8d1762b 100644
--- a/conf/app/drupal.groovy
+++ b/conf/app/drupal.groovy
@@ -19,8 +19,10 @@ class DrupalPhpUnitTestPack extends
RequiredDatabasePhpUnitSourceTestPack {
}
@Override
- protected String getSourceRoot(AHost host) {
- return host.getPfttDir()+"/cache/working/drupal-8.x-dev";
+ protected String getSourceRoot(ConsoleManager cm, AHost host) {
+ ensureAppDecompressed(cm, host, "drupal-8.7z")
+
+ return host.getPfttDir()+"/cache/working/drupal-8";
}
@Override
diff --git a/conf/app/joomla.groovy b/conf/app/joomla.groovy
index 55fe851..ca3141f 100644
--- a/conf/app/joomla.groovy
+++ b/conf/app/joomla.groovy
@@ -26,7 +26,9 @@ class JoomlaPlatformPhpUnitTestPack extends
OptionalDatabasePhpUnitSourceTestPac
}
@Override
- protected String getSourceRoot(AHost host) {
+ protected String getSourceRoot(ConsoleManager cm, AHost host) {
+ ensureAppDecompressed(cm, host, "joomla-platform.7z")
+
return host.getPfttDir()+"/cache/working/joomla-platform";
}
diff --git a/conf/app/mediawiki.groovy b/conf/app/mediawiki.groovy
index aa0af99..a9abf80 100644
--- a/conf/app/mediawiki.groovy
+++ b/conf/app/mediawiki.groovy
@@ -16,8 +16,10 @@ class MediaWikiPhpUnitTestPack extends
RequiredDatabasePhpUnitSourceTestPack {
}
@Override
- protected String getSourceRoot(AHost host) {
- return host.getPfttDir()+"/cache/working/mediawiki-1.20.2";
+ protected String getSourceRoot(ConsoleManager cm, AHost host) {
+ ensureAppDecompressed(cm, host, "mediawiki")
+
+ return host.getPfttDir()+"/cache/working/mediawiki";
}
@Override
diff --git a/conf/app/phpbb3.groovy b/conf/app/phpbb3.groovy
index 688b358..c67b75d 100644
--- a/conf/app/phpbb3.groovy
+++ b/conf/app/phpbb3.groovy
@@ -22,7 +22,9 @@ class PhpBB3PhpUnitTestPack extends
RequiredDatabasePhpUnitSourceTestPack {
}
@Override
- protected String getSourceRoot(AHost host) {
+ protected String getSourceRoot(ConsoleManager cm, AHost host) {
+ ensureAppDecompressed(cm, host, "phpbb3.7z")
+
return host.getPfttDir()+"/cache/working/phpbb3";
}
diff --git a/conf/app/phpmyadmin.groovy b/conf/app/phpmyadmin.groovy
index 2715423..7d66b66 100644
--- a/conf/app/phpmyadmin.groovy
+++ b/conf/app/phpmyadmin.groovy
@@ -15,7 +15,7 @@ class PhpMyAdminPhpUnitTestPack extends
RequiredDatabasePhpUnitSourceTestPack {
}
@Override
- protected String getSourceRoot(AHost host) {
+ protected String getSourceRoot(ConsoleManager cm, AHost host) {
return host.getPfttDir()+"/cache/working/phpmyadmin";
}
diff --git a/conf/app/semantic_mediawiki.groovy
b/conf/app/semantic_mediawiki.groovy
index de5c4ff..cec084c 100644
--- a/conf/app/semantic_mediawiki.groovy
+++ b/conf/app/semantic_mediawiki.groovy
@@ -19,8 +19,10 @@ class SemanticMediaWikiPhpUnitTestPack extends
RequiredDatabasePhpUnitSourceTest
}
@Override
- protected String getSourceRoot(AHost host) {
- return host.getPfttDir()+"/cache/working/SemanticMediaWiki1.8";
+ protected String getSourceRoot(ConsoleManager cm, AHost host) {
+ ensureAppDecompressed(cm, host, "SemanticMediaWiki.7z")
+
+ return host.getPfttDir()+"/cache/working/SemanticMediaWiki";
}
@Override
diff --git a/conf/app/typo3.groovy b/conf/app/typo3.groovy
index 10b6892..731716f 100644
--- a/conf/app/typo3.groovy
+++ b/conf/app/typo3.groovy
@@ -7,7 +7,7 @@ class Typo3PhpUnitTestPack extends PhpUnitSourceTestPack {
}
@Override
- protected String getSourceRoot(AHost host) {
+ protected String getSourceRoot(ConsoleManager cm, AHost host) {
return host.getPfttDir()+"/cache/working/typo3";
}
diff --git a/conf/app/wordpress.groovy b/conf/app/wordpress.groovy
index ff7dc84..bfd6ce4 100644
--- a/conf/app/wordpress.groovy
+++ b/conf/app/wordpress.groovy
@@ -23,7 +23,9 @@ class WordpressPhpUnitTestPack extends
RequiredDatabasePhpUnitSourceTestPack {
}
@Override
- protected String getSourceRoot(AHost host) {
+ protected String getSourceRoot(ConsoleManager cm, AHost host) {
+ ensureAppDecompressed(cm, host, "wordpress-tests.7z")
+
return host.getPfttDir()+"/cache/working/wordpress-tests";
}
diff --git a/conf/cake_php.groovy b/conf/cake_php.groovy
index 08b2174..adf4c3f 100644
--- a/conf/cake_php.groovy
+++ b/conf/cake_php.groovy
@@ -7,7 +7,7 @@ class CakePhpUnitTestPack extends PhpUnitSourceTestPack {
}
@Override
- protected String getSourceRoot(AHost host) {
+ protected String getSourceRoot(ConsoleManager cm, AHost host) {
return host.getPfttDir()+"/cache/working/cakephp";
}
diff --git a/src/com/mostc/pftt/host/AHost.java
b/src/com/mostc/pftt/host/AHost.java
index d7d2c0a..71461e4 100644
--- a/src/com/mostc/pftt/host/AHost.java
+++ b/src/com/mostc/pftt/host/AHost.java
@@ -716,9 +716,12 @@ public abstract class AHost extends Host implements
IProgramRunner {
public boolean decompress(ConsoleManager cm, AHost ohost, String
zip7_file, String dst) throws IllegalStateException, IOException, Exception {
ensure7Zip(cm, ohost);
+ zip7_file = fixPath(zip7_file);
+ dst = fixPath(dst);
+
String output_dir = dst;
mkdirs(output_dir);
-
+
if (cm!=null)
cm.println(EPrintType.IN_PROGRESS, getClass(),
"decompress output_dir="+output_dir+" zip7_file="+zip7_file);
diff --git a/src/com/mostc/pftt/model/app/PhpUnitSourceTestPack.java
b/src/com/mostc/pftt/model/app/PhpUnitSourceTestPack.java
index 4e5facc..a0cb140 100644
--- a/src/com/mostc/pftt/model/app/PhpUnitSourceTestPack.java
+++ b/src/com/mostc/pftt/model/app/PhpUnitSourceTestPack.java
@@ -428,7 +428,7 @@ public abstract class PhpUnitSourceTestPack implements
SourceTestPack<PhpUnitAct
@Override
public PhpUnitActiveTestPack installInPlace(ConsoleManager cm, AHost
host) throws Exception {
- final String src_root = getSourceRoot(new LocalHost());
+ final String src_root = getSourceRoot(cm, new LocalHost());
addIncludeDirectory(src_root);
if (!new File(src_root).isDirectory()) {
throw new IOException("source-test-pack not found:
"+src_root);
@@ -442,7 +442,7 @@ public abstract class PhpUnitSourceTestPack implements
SourceTestPack<PhpUnitAct
@Override
public PhpUnitActiveTestPack installNamed(ConsoleManager cm, AHost
host, String string, List<PhpUnitTestCase> test_cases) throws
IllegalStateException, IOException, Exception {
- final String src_root = getSourceRoot(new LocalHost());
+ final String src_root = getSourceRoot(cm, new LocalHost());
addIncludeDirectory(src_root);
if (!new File(src_root).isDirectory()) {
throw new IOException("source-test-pack not found:
"+src_root);
@@ -459,7 +459,7 @@ public abstract class PhpUnitSourceTestPack implements
SourceTestPack<PhpUnitAct
String local_test_pack_dir, String remote_test_pack_dir)
throws IllegalStateException, IOException, Exception {
LocalHost local_host = new LocalHost();
- final String src_root = getSourceRoot(local_host);
+ final String src_root = getSourceRoot(cm, local_host);
addIncludeDirectory(src_root);
if (!new File(src_root).isDirectory()) {
throw new IOException("source-test-pack not found:
"+src_root);
@@ -476,13 +476,27 @@ public abstract class PhpUnitSourceTestPack implements
SourceTestPack<PhpUnitAct
return new PhpUnitActiveTestPack(local_test_pack_dir,
remote_test_pack_dir);
}
+ private boolean decompressed = false;
+ protected void ensureAppDecompressed(ConsoleManager cm, AHost host,
String zip7_file) throws IllegalStateException, IOException, Exception {
+ if (decompressed)
+ return;
+ decompressed = true;
+ if (!StringUtil.endsWithIC(zip7_file, ".7z"))
+ zip7_file += ".7z";
+
+ host.decompress(cm, host, host.getPfttDir()+"/app/"+zip7_file,
host.getPfttDir()+"/cache/working/");
+ }
+
/** the base directory within the PFTT directory to find the phpunit
and required php files
*
+ * Typically, test-packs will call #ensureAppDecompressed
+ *
+ * @param cm
* @param host - determine the absolute path on this host
* @see AHost#getPfttDir
* @return
*/
- protected abstract String getSourceRoot(AHost host);
+ protected abstract String getSourceRoot(ConsoleManager cm, AHost host);
/** installs the tests after they have been copied to storage (if
needed)
*--
PHP Quality Assurance Mailing List <http://www.php.net/>
To unsubscribe, visit: http://www.php.net/unsub.php
