瀏覽代碼

Merge pull request #11103 from mckellyln/hpcc-19258b

HPCC-19258 Remove noroxie from regression files

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 7 年之前
父節點
當前提交
0042874ad2

+ 0 - 1
testing/regress/ecl/aggsq1seq.ecl

@@ -16,7 +16,6 @@
 ############################################################################## */
 
 //noThor
-//noRoxie
 
 namesRecord := 
             RECORD

+ 0 - 1
testing/regress/ecl/aggsq2.ecl

@@ -15,7 +15,6 @@
     limitations under the License.
 ############################################################################## */
 
-//noRoxie
 #option ('optimizeDiskSource',true);
 #option ('optimizeThorCounts',false);
 #option ('optimizeChildSource',true);

+ 0 - 1
testing/regress/ecl/aggsq2seq.ecl

@@ -15,7 +15,6 @@
     limitations under the License.
 ############################################################################## */
 
-//noRoxie
 #option ('optimizeDiskSource',true);
 #option ('optimizeThorCounts',false);
 #option ('optimizeChildSource',true);

+ 0 - 1
testing/regress/ecl/aggsq3.ecl

@@ -16,7 +16,6 @@
 ############################################################################## */
 
 //nothor
-//noRoxie
 #option ('optimizeDiskSource',true);
 #option ('optimizeThorCounts',false);
 #option ('optimizeChildSource',true);

+ 0 - 1
testing/regress/ecl/aggsq3seq.ecl

@@ -16,7 +16,6 @@
 ############################################################################## */
 
 //nothor
-//noRoxie
 #option ('optimizeDiskSource',true);
 #option ('optimizeThorCounts',false);
 #option ('optimizeChildSource',true);

+ 0 - 1
testing/regress/ecl/aggsq4.ecl

@@ -16,7 +16,6 @@
 ############################################################################## */
 
 //noThor
-//noRoxie
 #option ('optimizeChildSource',true);
 
 namesRecord := 

+ 0 - 1
testing/regress/ecl/aggsq4seq.ecl

@@ -16,7 +16,6 @@
 ############################################################################## */
 
 //noThor
-//noRoxie
 #option ('optimizeChildSource',true);
 
 namesRecord := 

+ 0 - 1
testing/regress/ecl/apersistschedule1.ecl

@@ -19,7 +19,6 @@
 
 //no point testing this lots of times - testing the workflow engine once in hthor is enough
 //nothor
-//noroxie
 //nothorlcr
 
 ds := DATASET(['one','two','three'], { string text; });

+ 0 - 1
testing/regress/ecl/child_dict_stored.ecl

@@ -1,6 +1,5 @@
 // Test fetching child dictionaries and datasets from stored
 
-// noroxie
 // nothor
 
 d1 := dataset(

+ 0 - 1
testing/regress/ecl/critical1.ecl

@@ -18,7 +18,6 @@ import Std;
 import $.setup;
 prefix := setup.Files(false, false).FilePrefix;
 
-//noroxie
 //nohthor
 
 rawRecord := RECORD

+ 0 - 1
testing/regress/ecl/dbz1.ecl

@@ -17,7 +17,6 @@
 
 //nothor
 //nothorlcr
-//noroxie
 
 //class=error
 

+ 0 - 1
testing/regress/ecl/dbz2a.ecl

@@ -17,7 +17,6 @@
 
 //nothor
 //nothorlcr
-//noroxie
 
 //class=error
 

+ 0 - 1
testing/regress/ecl/dbz2b.ecl

@@ -17,7 +17,6 @@
 
 //nothor
 //nothorlcr
-//noroxie
 
 //class=error
 

+ 0 - 1
testing/regress/ecl/dbz2c.ecl

@@ -17,7 +17,6 @@
 
 //nothor
 //nothorlcr
-//noroxie
 
 //class=error
 

+ 1 - 1
testing/regress/ecl/dict_index.ecl

@@ -1,5 +1,5 @@
 //nothor
-//noroxie
+#option('warnOnImplicitJoinLimit', false);
 import $.setup;
 prefix := setup.Files(false, false).IndexPrefix;
 d := dataset(

+ 0 - 1
testing/regress/ecl/external.ecl

@@ -1,4 +1,3 @@
-//noroxie
 
 import Std.File;
 

+ 0 - 1
testing/regress/ecl/filecompcopy.ecl

@@ -17,7 +17,6 @@
 
 import $.setup;
 prefix := setup.Files(false, false).FilePrefix;
-//noroxie 
 //skip type=roxie nodfu       
 
 // testing compressed->compressed, expanded->compressed, and compressed->expanded copies

+ 0 - 1
testing/regress/ecl/globalmerge.ecl

@@ -18,7 +18,6 @@
 #onwarning(1045, ignore);
 
 // global merge regression test (also tests large variable rows)
-//noRoxie
 
 import std.system.thorlib;
 

+ 1 - 1
testing/regress/ecl/imgkey.ecl

@@ -17,9 +17,9 @@
 
 #onwarning (2304, ignore);
 
+#option('warnOnImplicitReadLimit', false);
 import $.setup;
 prefix := setup.Files(false, false).FilePrefix;
-//noRoxie
 
 vstring(integer i) := TYPE
     export integer physicallength(string s) := i;

+ 1 - 1
testing/regress/ecl/keyed_join4.ecl

@@ -15,9 +15,9 @@
     limitations under the License.
 ############################################################################## */
 
+#option('warnOnImplicitJoinLimit', false);
 import $.setup;
 prefix := setup.Files(false, false).FilePrefix;
-//noroxie
 
 import std.system.thorlib;
 import Std.File AS FileServices;

+ 0 - 1
testing/regress/ecl/likely.ecl

@@ -16,7 +16,6 @@
 ############################################################################## */
 
 //nohthor
-//noroxie
 import $.setup;
 prefix := setup.Files(false, false).FilePrefix;
 

+ 0 - 1
testing/regress/ecl/looplookup.ecl

@@ -15,7 +15,6 @@
     limitations under the License.
 ############################################################################## */
 
-//noroxie TBD
 //nohthor TBD
 
 rec := RECORD  

+ 1 - 1
testing/regress/ecl/loopvar.ecl

@@ -15,8 +15,8 @@
     limitations under the License.
 ############################################################################## */
 
-//noroxie
 
+#option('warnOnImplicitJoinLimit', false);
 import Std;
 
 filename1 := '~someflatfile1';

+ 1 - 1
testing/regress/ecl/spillsort.ecl

@@ -15,7 +15,6 @@
     limitations under the License.
 ############################################################################## */
 
-//noRoxie
 //nothor
 //class=file
 //class=index
@@ -28,6 +27,7 @@ useTranslation := #IFDEFINED(root.useTranslation, false);
 
 //--- end of version configuration ---
 
+#option ('warnOnImplicitJoinLimit', false);
 #option ('hthorSpillThreshold',3000);
 #option ('layoutTranslation', useTranslation);
 

+ 0 - 1
testing/regress/ecl/thorlib1.ecl

@@ -15,7 +15,6 @@
     limitations under the License.
 ############################################################################## */
 
-//noroxie
 
 import lib_thorlib;
 

+ 0 - 1
testing/regress/ecl/wuread.ecl

@@ -15,7 +15,6 @@
     limitations under the License.
 ############################################################################## */
 
-//noroxie 
 //doesn't make sense to read from other work units in roxie.
 
 namesRecord := 

+ 0 - 1
testing/regress/ecl/xmlout.ecl

@@ -15,7 +15,6 @@
     limitations under the License.
 ############################################################################## */
 
-//noroxie
 import $.setup;
 prefix := setup.Files(false, false).FilePrefix;
 

+ 0 - 1
testing/regress/ecl/xmlout2.ecl

@@ -15,7 +15,6 @@
     limitations under the License.
 ############################################################################## */
 
-//noroxie
 import $.setup;
 prefix := setup.Files(false, false).FilePrefix;