HPCC-12017 Refactor the self.args.setupExtraX code

Rrefactor the code. Remove all lines inserted by Gavin and put then
into the main(). This change fixed the "won't work in run mode" problem
(there was wrong instruction sequence)

Fix problem caused class handling (inclde/eclude) in query mode
(there was a wrong initialisation of classIncluded/classExcluded

Signed-off-by: Attila Vamos <attila.vamos@gmail.com>

testing/regress/ecl-test

@@ -75,10 +75,6 @@ class RegressMain:
         for cluster in self.targetClusters:
             try:
                 self.regress.config.ip = self.regress.config.IpAddress[cluster]
-                self.args.setupExtraX = []
-                self.args.setupExtraX.append('OriginalTextFilesOsPath='+self.regressionSuiteHpccMainOsDir)
-                self.args.setupExtraX.append('OriginalTextFilesEclPath='+self.regressionSuiteHpccMainEclDir)
-                self.args.setupExtraX.append('OriginalTextFilesIp='+getRealIPAddress())
                 if len(eclfiles) > 1:
                     #Execute multiple ECL files like RUN to generates summary results and diff report.
                     self.regress.bootstrap(cluster, self.args,  eclfiles)
@@ -108,10 +104,6 @@ class RegressMain:
     def setup(self):
         # Go through the cluster list
         for cluster in self.targetClusters:
-            self.args.setupExtraX = []
-            self.args.setupExtraX.append('OriginalTextFilesOsPath='+self.regressionSuiteHpccMainOsDir)
-            self.args.setupExtraX.append('OriginalTextFilesEclPath='+self.regressionSuiteHpccMainEclDir)
-            self.args.setupExtraX.append('OriginalTextFilesIp='+getRealIPAddress())
             self.args.target = cluster
             self.regress.config.ip = self.regress.config.IpAddress[cluster]
             if  self.args.pq :
@@ -123,10 +115,6 @@ class RegressMain:
         # Go through the cluster list
         for cluster in self.targetClusters:
             self.regress.bootstrap(cluster, self.args)
-            self.args.setupExtraX = []
-            self.args.setupExtraX.append('OriginalTextFilesOsPath='+self.regressionSuiteHpccMainOsDir)
-            self.args.setupExtraX.append('OriginalTextFilesEclPath='+self.regressionSuiteHpccMainEclDir)
-            self.args.setupExtraX.append('OriginalTextFilesIp='+getRealIPAddress())
             self.args.target = cluster
             self.regress.config.ip = self.regress.config.IpAddress[cluster]
             if  self.args.pq :
@@ -226,6 +214,11 @@ class RegressMain:
             self.regressionSuiteHpccMainOsDir = regressionSuiteFullPath
             self.regressionSuiteHpccMainEclDir = convertPath(regressionSuiteFullPath)+"::download"
 
+            self.args.setupExtraX = []
+            self.args.setupExtraX.append('OriginalTextFilesOsPath='+self.regressionSuiteHpccMainOsDir)
+            self.args.setupExtraX.append('OriginalTextFilesEclPath='+self.regressionSuiteHpccMainEclDir)
+            self.args.setupExtraX.append('OriginalTextFilesIp='+getRealIPAddress())
+
             self.regress = Regression(self.args)
             logging.debug("Suite full path:%s",  regressionSuiteFullPath)
 

testing/regress/hpcc/regression/suite.py

@@ -60,12 +60,12 @@ class Suite:
         else:
                 allfiles = fileList
 
-        classIncluded=''
+        classIncluded='all'
         if 'runclass' in args:
             classIncluded=args.runclass[0].split(',')
             pass
 
-        classExcluded=''
+        classExcluded='none'
         if 'excludeclass' in args:
             classExcluded = args.excludeclass[0].split(',')
             pass