Merge pull request #13969 from AttilaVamos/HPCC-24395-impr-7.10.x

HPCC-24395 Add verbose option to ecl-test so that it logs what commands it's running

Reviewed-By: Jake Smith <jake.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

testing/regress/ecl-test

@@ -228,6 +228,8 @@ class RegressMain:
                                 nargs=1,  default = ['none'],   metavar="filespec[,filespec,...]")
         executionParser.add_argument('--generateStackTrace', help="Generate stack trace of Thor components before kill a timeouted test case. Trace files are stored into Regression Engine Log directory (see 'LogDir' in ecl-test.json file)",
                                 action = 'store_true')
+        executionParser.add_argument('--createEclRunArg', help="Generate ECL tool command line.",
+                                action='store_true')
 
 
         parser = argparse.ArgumentParser(prog=prog, description=description,  parents=[helperParser, commonParser,  executionParser])
@@ -244,8 +246,6 @@ class RegressMain:
                                  action='store_true')
         parser_list.add_argument('--target', '-t', help="Provide target cluster(s) to list test cases. If target = 'all' then list test cases on all clusters. If not defined then default value(s) come from config (ecl-test.json by default).",
                                 nargs='?', type=str,  default='', metavar="target_cluster_list | all")
-        parser_list.add_argument('--createEclRunArg', help="Generate ECL tool command line.",
-                                action='store_true')
 
 
         parser_setup = subparsers.add_parser('setup', help='Setup help',  parents=[helperParser, commonParser, executionParser])

testing/regress/hpcc/regression/regress.py

@@ -31,7 +31,7 @@ from ..regression.suite import Suite
 from ..util.ecl.cc import ECLCC
 from ..util.ecl.command import ECLcmd
 from ..util.expandcheck import ExpandCheck
-from ..util.util import getConfig, queryWuid,  abortWorkunit, getVersionNumbers, createZAP
+from ..util.util import getConfig, queryWuid,  abortWorkunit, getVersionNumbers, createZAP, getEclRunArgs
 
 
 class Regression:
@@ -503,6 +503,8 @@ class Regression:
 
         logging.debug("runQuery(engine: '%s', cluster: '%s', query: '%s', cnt: %d, publish: %s, thread id: %d" % ( engine, cluster, query.ecl, cnt, publish,  th))
         logging.warn("%3d. Test: %s" % (cnt, query.getBaseEclRealName()),  extra={'taskId':cnt})
+        if 'createEclRunArg' in self.args and self.args.createEclRunArg:
+            logging.warn("%3d. Cmd: %s %s/%s" % (cnt, getEclRunArgs(query, engine, cluster), query.dir_ec, query.getBaseEcl())),
 
         self.loggermutex.release()
         res = 0