mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2024-12-22 16:31:53 +00:00
Make --disable-phpt and --only-phpt flags work with multitest.php
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1558 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
parent
51da183f80
commit
f4c4354ae4
@ -38,16 +38,14 @@ $AC['file'] = '';
|
|||||||
$AC['xml'] = false;
|
$AC['xml'] = false;
|
||||||
$AC['quiet'] = false;
|
$AC['quiet'] = false;
|
||||||
$AC['php'] = 'php';
|
$AC['php'] = 'php';
|
||||||
|
$AC['disable-phpt'] = false;
|
||||||
|
$AC['only-phpt'] = false;
|
||||||
$aliases = array(
|
$aliases = array(
|
||||||
'f' => 'file',
|
'f' => 'file',
|
||||||
'q' => 'quiet',
|
'q' => 'quiet',
|
||||||
);
|
);
|
||||||
htmlpurifier_parse_args($AC, $aliases);
|
htmlpurifier_parse_args($AC, $aliases);
|
||||||
|
|
||||||
// Currently not configurable
|
|
||||||
$AC['disable-phpt'] = false;
|
|
||||||
$AC['only-phpt'] = false;
|
|
||||||
|
|
||||||
// Calls generate-includes.php automatically
|
// Calls generate-includes.php automatically
|
||||||
shell_exec($AC['php'] . ' ../maintenance/merge-library.php');
|
shell_exec($AC['php'] . ' ../maintenance/merge-library.php');
|
||||||
|
|
||||||
@ -78,6 +76,7 @@ foreach ($versions_to_test as $version) {
|
|||||||
$version = $version[0];
|
$version = $version[0];
|
||||||
$flush = '--flush';
|
$flush = '--flush';
|
||||||
}
|
}
|
||||||
|
if (!$AC['only-phpt']) {
|
||||||
if (!$AC['exclude-normal']) {
|
if (!$AC['exclude-normal']) {
|
||||||
$test->addTestCase(
|
$test->addTestCase(
|
||||||
new CliTestCase(
|
new CliTestCase(
|
||||||
@ -94,15 +93,15 @@ foreach ($versions_to_test as $version) {
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
// naming is inconsistent:
|
}
|
||||||
//if (!$AC['disable-phpt']) {
|
if (!$AC['disable-phpt']) { // naming is not consistent
|
||||||
$test->addTestCase(
|
$test->addTestCase(
|
||||||
new CliTestCase(
|
new CliTestCase(
|
||||||
$AC['php'] . " index.php --xml --php \"$phpv $version\" --only-phpt",
|
$AC['php'] . " index.php --xml --php \"$phpv $version\" --only-phpt",
|
||||||
$AC['quiet'], $size
|
$AC['quiet'], $size
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
//}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// This is the HTML Purifier website's test XML file. We could
|
// This is the HTML Purifier website's test XML file. We could
|
||||||
|
Loading…
Reference in New Issue
Block a user