File tree Expand file tree Collapse file tree 2 files changed +9
-5
lines changed
packages/kbn-test/src/functional_tests Expand file tree Collapse file tree 2 files changed +9
-5
lines changed Original file line number Diff line number Diff line change @@ -75,7 +75,8 @@ export function displayHelp() {
7575export function processOptions ( userOptions , defaultConfigPath ) {
7676 validateOptions ( userOptions ) ;
7777
78- const config = userOptions . config || defaultConfigPath ;
78+ const useDefaultConfig = userOptions . config === undefined ;
79+ const config = useDefaultConfig ? defaultConfigPath : userOptions . config ;
7980
8081 if ( ! config ) {
8182 throw new Error ( `functional_tests_server: config is required` ) ;
@@ -100,6 +101,7 @@ export function processOptions(userOptions, defaultConfigPath) {
100101 return {
101102 ...userOptions ,
102103 config : resolve ( config ) ,
104+ useDefaultConfig,
103105 createLogger,
104106 extraKbnOpts : userOptions . _ ,
105107 } ;
Original file line number Diff line number Diff line change @@ -37,10 +37,12 @@ import { readConfigFile } from '../functional_test_runner/lib';
3737const makeSuccessMessage = ( options ) => {
3838 const installDirFlag = options . installDir ? ` --kibana-install-dir=${ options . installDir } ` : '' ;
3939 const configPaths = Array . isArray ( options . config ) ? options . config : [ options . config ] ;
40- const pathsMessage = configPaths
41- . map ( ( path ) => relative ( process . cwd ( ) , path ) )
42- . map ( ( path ) => ` --config ${ path } ` )
43- . join ( '' ) ;
40+ const pathsMessage = options . useDefaultConfig
41+ ? ''
42+ : configPaths
43+ . map ( ( path ) => relative ( process . cwd ( ) , path ) )
44+ . map ( ( path ) => ` --config ${ path } ` )
45+ . join ( '' ) ;
4446
4547 return (
4648 '\n\n' +
You can’t perform that action at this time.
0 commit comments