1
0
Fork 0

migrate wording boost->catch

This commit is contained in:
Wilfried Goesgens 2017-03-16 17:18:28 +01:00
parent 3f29cf356b
commit e4fbbcd0eb
1 changed files with 9 additions and 9 deletions

View File

@ -32,7 +32,7 @@ const functionsDocumentation = {
'arangosh': 'arangosh exit codes tests',
'authentication': 'authentication tests',
'authentication_parameters': 'authentication parameters tests',
'boost': 'boost test suites',
'catch': 'catch test suites',
'config': 'checks the config file parsing',
'client_resilience': 'client resilience tests',
'cluster_sync': 'cluster sync tests',
@ -78,7 +78,7 @@ const optionsDocumentation = [
' - `skipArangoBenchNonConnKeepAlive`: if set to true benchmark do not use keep-alive',
' - `skipArangoBench`: if set to true benchmark tests are skipped',
' - `skipAuthentication : testing authentication and authentication_paramaters will be skipped.',
' - `skipBoost`: if set to true the boost unittests are skipped',
' - `skipCatch`: if set to true the catch unittests are skipped',
' - `skipCache`: if set to true, the hash cache unittests are skipped',
' - `skipConfig`: omit the noisy configuration tests',
' - `skipFoxxQueues`: omit the test for the foxx queues',
@ -178,7 +178,7 @@ const optionsDefaults = {
'skipArangoBench': false,
'skipArangoBenchNonConnKeepAlive': true,
'skipAuthentication': false,
'skipBoost': false,
'skipCatch': false,
'skipCache': true,
'skipEndpoints': false,
'skipGeo': false,
@ -2036,7 +2036,7 @@ let allTests = [
'arangosh',
'authentication',
'authentication_parameters',
'boost',
'catch',
'config',
'dump',
'dump_authentication',
@ -2674,10 +2674,10 @@ testFuncs.authentication_parameters = function (options) {
};
// //////////////////////////////////////////////////////////////////////////////
// / @brief TEST: boost
// / @brief TEST: Catch
// //////////////////////////////////////////////////////////////////////////////
function locateBoostTest (name) {
function locateCatchTest (name) {
var file = fs.join(UNITTESTS_DIR, name + executable_ext);
if (!fs.exists(file)) {
@ -2686,14 +2686,14 @@ function locateBoostTest (name) {
return file;
}
testFuncs.boost = function (options) {
testFuncs.catch = function (options) {
let args = [];
let results = {};
const icuDir = UNITTESTS_DIR + '/';
require('internal').env.ICU_DATA = icuDir;
const run = locateBoostTest('arangodbtests');
if (!options.skipBoost) {
const run = locateCatchTest('arangodbtests');
if (!options.skipCatch) {
if (run !== '') {
results.basics = executeAndWait(run, ['[exclude:longRunning][exclude:cache]', '-r', 'junit', '-o', fs.join('out', 'catch-standard.xml')], options);
} else {