Remove OGC from escript testsuite

polserver · Mar 1, 2021 · a0c297a · a0c297a
1 parent 9e2d3b0
commit a0c297a
Show file tree

Hide file tree

Showing 135 changed files with 6 additions and 85 deletions.
diff --git a/cmake/escripttest.cmake b/cmake/escripttest.cmake
@@ -80,7 +80,7 @@ function (checkprocfailure output errorfile result)
 endfunction()
 
 # start of test
-function (testwithcompiler errfilesuffix antlroption)
+function (testwithcompiler)
   file(GLOB scripts RELATIVE ${testdir} ${testdir}/${subtest}/*)
   foreach(script ${scripts})
     string(FIND "${script}" ".src" out)
@@ -89,17 +89,17 @@ function (testwithcompiler errfilesuffix antlroption)
     endif()
     message(${script})
     string(REPLACE ".src" "" scriptname "${script}")
-    if (EXISTS "${testdir}/${scriptname}.out" OR EXISTS "${testdir}/${scriptname}.err${errfilesuffix}")
-      execute_process( COMMAND ${ecompile} ${antlroption} -q -C ecompile.cfg ${script}
+    if (EXISTS "${testdir}/${scriptname}.out" OR EXISTS "${testdir}/${scriptname}.err")
+      execute_process( COMMAND ${ecompile} -q -C ecompile.cfg ${script}
         RESULT_VARIABLE ecompile_res
         OUTPUT_VARIABLE ecompile_out
         ERROR_VARIABLE ecompile_out)
-      if (EXISTS "${testdir}/${scriptname}.err${errfilesuffix}")
+      if (EXISTS "${testdir}/${scriptname}.err")
         if("${ecompile_res}" STREQUAL "0")
           cleanup(${scriptname})
           message(SEND_ERROR "${scriptname}.src compiled, but should not")
         else()
-          checkprocfailure("${ecompile_out}" "${testdir}/${scriptname}.err${errfilesuffix}" success)
+          checkprocfailure("${ecompile_out}" "${testdir}/${scriptname}.err" success)
           if (NOT ${success})
             cleanup(${scriptname})
             message(SEND_ERROR "${scriptname}.src failed with different error")
@@ -145,5 +145,4 @@ function (testwithcompiler errfilesuffix antlroption)
   endforeach()
 endfunction()
 
-testwithcompiler("1" "-g-")
-testwithcompiler("2" "-g")
+testwithcompiler()
diff --git a/...ipt/arg/arg001-nonexistent-parameter.err2 → ...ript/arg/arg001-nonexistent-parameter.err b/...ipt/arg/arg001-nonexistent-parameter.err2 → ...ript/arg/arg001-nonexistent-parameter.err
diff --git a/testsuite/escript/arg/arg001-nonexistent-parameter.err1 b/testsuite/escript/arg/arg001-nonexistent-parameter.err1
diff --git a/...script/arg/arg002-too-many-arguments.err2 → ...escript/arg/arg002-too-many-arguments.err b/...script/arg/arg002-too-many-arguments.err2 → ...escript/arg/arg002-too-many-arguments.err
diff --git a/testsuite/escript/arg/arg002-too-many-arguments.err1 b/testsuite/escript/arg/arg002-too-many-arguments.err1
diff --git a/testsuite/escript/array/array14.err1 → testsuite/escript/array/array14.err b/testsuite/escript/array/array14.err1 → testsuite/escript/array/array14.err
diff --git a/testsuite/escript/bug/bug.err2 → testsuite/escript/bug/bug.err b/testsuite/escript/bug/bug.err2 → testsuite/escript/bug/bug.err
diff --git a/testsuite/escript/bug/bug.err1 b/testsuite/escript/bug/bug.err1
diff --git a/testsuite/escript/bug/bug004.err2 → testsuite/escript/bug/bug004.err b/testsuite/escript/bug/bug004.err2 → testsuite/escript/bug/bug004.err
diff --git a/testsuite/escript/bug/bug004.err1 b/testsuite/escript/bug/bug004.err1
diff --git a/testsuite/escript/bug/bug006.err2 → testsuite/escript/bug/bug006.err b/testsuite/escript/bug/bug006.err2 → testsuite/escript/bug/bug006.err
diff --git a/testsuite/escript/bug/bug006.err1 b/testsuite/escript/bug/bug006.err1
diff --git a/testsuite/escript/bug/bug007.err2 → testsuite/escript/bug/bug007.err b/testsuite/escript/bug/bug007.err2 → testsuite/escript/bug/bug007.err
diff --git a/testsuite/escript/bug/bug007.err1 b/testsuite/escript/bug/bug007.err1
diff --git a/testsuite/escript/bug/bug008.err2 → testsuite/escript/bug/bug008.err b/testsuite/escript/bug/bug008.err2 → testsuite/escript/bug/bug008.err
diff --git a/testsuite/escript/bug/bug008.err1 b/testsuite/escript/bug/bug008.err1
diff --git a/testsuite/escript/bug/crash001.err2 → testsuite/escript/bug/crash001.err b/testsuite/escript/bug/crash001.err2 → testsuite/escript/bug/crash001.err
diff --git a/testsuite/escript/bug/crash001.err1 b/testsuite/escript/bug/crash001.err1
diff --git a/...t004-cannot-shadow-const-with-global.err2 → ...st004-cannot-shadow-const-with-global.err b/...t004-cannot-shadow-const-with-global.err2 → ...st004-cannot-shadow-const-with-global.err
diff --git a/testsuite/escript/const/const004-cannot-shadow-const-with-global.err1 b/testsuite/escript/const/const004-cannot-shadow-const-with-global.err1
diff --git a/...const/const008-cannot-call-user-func.err2 → .../const/const008-cannot-call-user-func.err b/...const/const008-cannot-call-user-func.err2 → .../const/const008-cannot-call-user-func.err
diff --git a/testsuite/escript/const/const008-cannot-call-user-func.err1 b/testsuite/escript/const/const008-cannot-call-user-func.err1
diff --git a/...cript/const/const011-populated-array.err2 → ...script/const/const011-populated-array.err b/...cript/const/const011-populated-array.err2 → ...script/const/const011-populated-array.err
diff --git a/testsuite/escript/const/const011-populated-array.err1 b/testsuite/escript/const/const011-populated-array.err1
diff --git a/.../const/const013-populated-dictionary.err2 → ...t/const/const013-populated-dictionary.err b/.../const/const013-populated-dictionary.err2 → ...t/const/const013-populated-dictionary.err
diff --git a/testsuite/escript/const/const013-populated-dictionary.err1 b/testsuite/escript/const/const013-populated-dictionary.err1
diff --git a/...cript/const/const015-populated-error.err2 → ...script/const/const015-populated-error.err b/...cript/const/const015-populated-error.err2 → ...script/const/const015-populated-error.err
diff --git a/testsuite/escript/const/const015-populated-error.err1 b/testsuite/escript/const/const015-populated-error.err1
diff --git a/...ript/const/const017-populated-struct.err2 → ...cript/const/const017-populated-struct.err b/...ript/const/const017-populated-struct.err2 → ...cript/const/const017-populated-struct.err
diff --git a/testsuite/escript/const/const017-populated-struct.err1 b/testsuite/escript/const/const017-populated-struct.err1
diff --git a/...rs/errors001-two-functions-same-name.err2 → ...ors/errors001-two-functions-same-name.err b/...rs/errors001-two-functions-same-name.err2 → ...ors/errors001-two-functions-same-name.err
diff --git a/testsuite/escript/errors/errors001-two-functions-same-name.err1 b/testsuite/escript/errors/errors001-two-functions-same-name.err1
diff --git a/.../errors002-var-same-name-as-function.err2 → ...s/errors002-var-same-name-as-function.err b/.../errors002-var-same-name-as-function.err2 → ...s/errors002-var-same-name-as-function.err
diff --git a/testsuite/escript/errors/errors002-var-same-name-as-function.err1 b/testsuite/escript/errors/errors002-var-same-name-as-function.err1
diff --git a/...tion-parameter-same-name-as-function.err2 → ...ction-parameter-same-name-as-function.err b/...tion-parameter-same-name-as-function.err2 → ...ction-parameter-same-name-as-function.err
diff --git a/testsuite/escript/errors/errors003-function-parameter-same-name-as-function.err1 b/testsuite/escript/errors/errors003-function-parameter-same-name-as-function.err1
diff --git a/...gram-parameter-same-name-as-function.err2 → ...ogram-parameter-same-name-as-function.err b/...gram-parameter-same-name-as-function.err2 → ...ogram-parameter-same-name-as-function.err
diff --git a/testsuite/escript/errors/errors004-program-parameter-same-name-as-function.err1 b/testsuite/escript/errors/errors004-program-parameter-same-name-as-function.err1
diff --git a/...rs004-reserved-word-as-argument-name.err2 → ...ors004-reserved-word-as-argument-name.err b/...rs004-reserved-word-as-argument-name.err2 → ...ors004-reserved-word-as-argument-name.err
diff --git a/testsuite/escript/errors/errors004-reserved-word-as-argument-name.err1 b/testsuite/escript/errors/errors004-reserved-word-as-argument-name.err1
diff --git a/...rrors005-const-same-name-as-function.err2 → ...errors005-const-same-name-as-function.err b/...rrors005-const-same-name-as-function.err2 → ...errors005-const-same-name-as-function.err
diff --git a/testsuite/escript/errors/errors005-const-same-name-as-function.err1 b/testsuite/escript/errors/errors005-const-same-name-as-function.err1
diff --git a/.../errors/errors005-missing-open-paren.err2 → ...t/errors/errors005-missing-open-paren.err b/.../errors/errors005-missing-open-paren.err2 → ...t/errors/errors005-missing-open-paren.err
diff --git a/testsuite/escript/errors/errors005-missing-open-paren.err1 b/testsuite/escript/errors/errors005-missing-open-paren.err1
diff --git a/...-loop-iterator-same-name-as-function.err2 → ...r-loop-iterator-same-name-as-function.err b/...-loop-iterator-same-name-as-function.err2 → ...r-loop-iterator-same-name-as-function.err
diff --git a/testsuite/escript/errors/errors006-for-loop-iterator-same-name-as-function.err1 b/testsuite/escript/errors/errors006-for-loop-iterator-same-name-as-function.err1
diff --git a/...reach-iterator-same-name-as-function.err2 → ...oreach-iterator-same-name-as-function.err b/...reach-iterator-same-name-as-function.err2 → ...oreach-iterator-same-name-as-function.err
diff --git a/testsuite/escript/errors/errors007-foreach-iterator-same-name-as-function.err1 b/testsuite/escript/errors/errors007-foreach-iterator-same-name-as-function.err1
diff --git a/...rs008-var-same-name-as-user-function.err2 → ...ors008-var-same-name-as-user-function.err b/...rs008-var-same-name-as-user-function.err2 → ...ors008-var-same-name-as-user-function.err
diff --git a/testsuite/escript/errors/errors008-var-same-name-as-user-function.err1 b/testsuite/escript/errors/errors008-var-same-name-as-user-function.err1
diff --git a/...pt/errors/errors009-int-out-of-range.err2 → ...ipt/errors/errors009-int-out-of-range.err b/...pt/errors/errors009-int-out-of-range.err2 → ...ipt/errors/errors009-int-out-of-range.err
diff --git a/testsuite/escript/errors/errors009-int-out-of-range.err1 b/testsuite/escript/errors/errors009-int-out-of-range.err1
diff --git a/...errors010-reserved-word-syntax-error.err2 → .../errors010-reserved-word-syntax-error.err b/...errors010-reserved-word-syntax-error.err2 → .../errors010-reserved-word-syntax-error.err
diff --git a/testsuite/escript/errors/errors010-reserved-word-syntax-error.err1 b/testsuite/escript/errors/errors010-reserved-word-syntax-error.err1
diff --git a/...ite/escript/export/export01-too-long.err2 → ...uite/escript/export/export01-too-long.err b/...ite/escript/export/export01-too-long.err2 → ...uite/escript/export/export01-too-long.err
diff --git a/testsuite/escript/export/export01-too-long.err1 b/testsuite/escript/export/export01-too-long.err1
diff --git a/...9-over-method-call-result-disallowed.err2 → ...19-over-method-call-result-disallowed.err b/...9-over-method-call-result-disallowed.err2 → ...19-over-method-call-result-disallowed.err
diff --git a/testsuite/escript/for/foreach19-over-method-call-result-disallowed.err1 b/testsuite/escript/for/foreach19-over-method-call-result-disallowed.err1
diff --git a/...0-over-function-reference-disallowed.err2 → ...20-over-function-reference-disallowed.err b/...0-over-function-reference-disallowed.err2 → ...20-over-function-reference-disallowed.err
diff --git a/testsuite/escript/for/foreach20-over-function-reference-disallowed.err1 b/testsuite/escript/for/foreach20-over-function-reference-disallowed.err1
diff --git a/...10-non-optimizable-default-parameter.err2 → ...010-non-optimizable-default-parameter.err b/...10-non-optimizable-default-parameter.err2 → ...010-non-optimizable-default-parameter.err
diff --git a/testsuite/escript/func/func010-non-optimizable-default-parameter.err1 b/testsuite/escript/func/func010-non-optimizable-default-parameter.err1
diff --git a/...default-parameter-bare-function-call.err2 → ...-default-parameter-bare-function-call.err b/...default-parameter-bare-function-call.err2 → ...-default-parameter-bare-function-call.err
diff --git a/testsuite/escript/func/func011-default-parameter-bare-function-call.err1 b/testsuite/escript/func/func011-default-parameter-bare-function-call.err1
diff --git a/testsuite/escript/func/func06.err2 → testsuite/escript/func/func06.err b/testsuite/escript/func/func06.err2 → testsuite/escript/func/func06.err
diff --git a/testsuite/escript/func/func06.err1 b/testsuite/escript/func/func06.err1
diff --git a/testsuite/escript/func/func09.err2 → testsuite/escript/func/func09.err b/testsuite/escript/func/func09.err2 → testsuite/escript/func/func09.err
diff --git a/testsuite/escript/func/func09.err1 b/testsuite/escript/func/func09.err1
diff --git a/testsuite/escript/func/func2.err2 → testsuite/escript/func/func2.err b/testsuite/escript/func/func2.err2 → testsuite/escript/func/func2.err
diff --git a/testsuite/escript/func/func2.err1 b/testsuite/escript/func/func2.err1
diff --git a/testsuite/escript/func/func2b.err2 → testsuite/escript/func/func2b.err b/testsuite/escript/func/func2b.err2 → testsuite/escript/func/func2b.err
diff --git a/testsuite/escript/func/func2b.err1 b/testsuite/escript/func/func2b.err1
diff --git a/testsuite/escript/func/funceof.err2 → testsuite/escript/func/funceof.err b/testsuite/escript/func/funceof.err2 → testsuite/escript/func/funceof.err
diff --git a/testsuite/escript/func/funceof.err1 b/testsuite/escript/func/funceof.err1
diff --git a/testsuite/escript/in/inc01.err2 → testsuite/escript/in/inc01.err b/testsuite/escript/in/inc01.err2 → testsuite/escript/in/inc01.err
diff --git a/testsuite/escript/in/inc01.err1 b/testsuite/escript/in/inc01.err1
diff --git a/testsuite/escript/in/inc02.err2 → testsuite/escript/in/inc02.err b/testsuite/escript/in/inc02.err2 → testsuite/escript/in/inc02.err
diff --git a/testsuite/escript/in/inc02.err1 b/testsuite/escript/in/inc02.err1
diff --git a/testsuite/escript/misc/casesensitivity.err2 → testsuite/escript/misc/casesensitivity.err b/testsuite/escript/misc/casesensitivity.err2 → testsuite/escript/misc/casesensitivity.err
diff --git a/testsuite/escript/misc/casesensitivity.err1 b/testsuite/escript/misc/casesensitivity.err1
diff --git a/testsuite/escript/misc/comp001.err2 → testsuite/escript/misc/comp001.err b/testsuite/escript/misc/comp001.err2 → testsuite/escript/misc/comp001.err
diff --git a/testsuite/escript/misc/comp001.err1 b/testsuite/escript/misc/comp001.err1
diff --git a/testsuite/escript/misc/fcall001.err2 → testsuite/escript/misc/fcall001.err b/testsuite/escript/misc/fcall001.err2 → testsuite/escript/misc/fcall001.err
diff --git a/testsuite/escript/misc/fcall001.err1 b/testsuite/escript/misc/fcall001.err1
diff --git a/testsuite/escript/misc/rpterr.err2 → testsuite/escript/misc/rpterr.err b/testsuite/escript/misc/rpterr.err2 → testsuite/escript/misc/rpterr.err
diff --git a/testsuite/escript/misc/rpterr.err1 b/testsuite/escript/misc/rpterr.err1
diff --git a/testsuite/escript/oper/singleequal01.err1 → testsuite/escript/oper/singleequal01.err b/testsuite/escript/oper/singleequal01.err1 → testsuite/escript/oper/singleequal01.err
diff --git a/testsuite/escript/oper/singleequal01.err2 b/testsuite/escript/oper/singleequal01.err2
diff --git a/testsuite/escript/oper/singleequal02.err2 → testsuite/escript/oper/singleequal02.err b/testsuite/escript/oper/singleequal02.err2 → testsuite/escript/oper/singleequal02.err
diff --git a/testsuite/escript/oper/singleequal02.err1 b/testsuite/escript/oper/singleequal02.err1
diff --git a/testsuite/escript/reff/ref001.err2 → testsuite/escript/reff/ref001.err b/testsuite/escript/reff/ref001.err2 → testsuite/escript/reff/ref001.err
diff --git a/testsuite/escript/reff/ref001.err1 b/testsuite/escript/reff/ref001.err1
diff --git a/testsuite/escript/reff/ref002.err2 → testsuite/escript/reff/ref002.err b/testsuite/escript/reff/ref002.err2 → testsuite/escript/reff/ref002.err
diff --git a/testsuite/escript/reff/ref002.err1 b/testsuite/escript/reff/ref002.err1
diff --git a/testsuite/escript/scope/scope02.err2 → testsuite/escript/scope/scope02.err b/testsuite/escript/scope/scope02.err2 → testsuite/escript/scope/scope02.err
diff --git a/testsuite/escript/scope/scope02.err1 b/testsuite/escript/scope/scope02.err1
diff --git a/testsuite/escript/scope/scope05.err2 → testsuite/escript/scope/scope05.err b/testsuite/escript/scope/scope05.err2 → testsuite/escript/scope/scope05.err
diff --git a/testsuite/escript/scope/scope05.err1 b/testsuite/escript/scope/scope05.err1
diff --git a/...-program-arg-same-level-var-conflict.err2 → ...6-program-arg-same-level-var-conflict.err b/...-program-arg-same-level-var-conflict.err2 → ...6-program-arg-same-level-var-conflict.err
diff --git a/testsuite/escript/scope/scope06-program-arg-same-level-var-conflict.err1 b/testsuite/escript/scope/scope06-program-arg-same-level-var-conflict.err1
diff --git a/...function-arg-same-level-var-conflict.err2 → ...-function-arg-same-level-var-conflict.err b/...function-arg-same-level-var-conflict.err2 → ...-function-arg-same-level-var-conflict.err
diff --git a/testsuite/escript/scope/scope08-function-arg-same-level-var-conflict.err1 b/testsuite/escript/scope/scope08-function-arg-same-level-var-conflict.err1
diff --git a/...script/switch/switch16-negative-case.err2 → ...escript/switch/switch16-negative-case.err b/...script/switch/switch16-negative-case.err2 → ...escript/switch/switch16-negative-case.err
diff --git a/testsuite/escript/switch/switch16-negative-case.err1 b/testsuite/escript/switch/switch16-negative-case.err1
diff --git a/...pt/switch/switch17-duplicate-default.err2 → ...ipt/switch/switch17-duplicate-default.err b/...pt/switch/switch17-duplicate-default.err2 → ...ipt/switch/switch17-duplicate-default.err
diff --git a/testsuite/escript/switch/switch17-duplicate-default.err1 b/testsuite/escript/switch/switch17-duplicate-default.err1
diff --git a/...ipt/switch/switch18-duplicate-string.err2 → ...ript/switch/switch18-duplicate-string.err b/...ipt/switch/switch18-duplicate-string.err2 → ...ript/switch/switch18-duplicate-string.err
diff --git a/testsuite/escript/switch/switch18-duplicate-string.err1 b/testsuite/escript/switch/switch18-duplicate-string.err1
diff --git a/...pt/switch/switch19-duplicate-integer.err2 → ...ipt/switch/switch19-duplicate-integer.err b/...pt/switch/switch19-duplicate-integer.err2 → ...ipt/switch/switch19-duplicate-integer.err
diff --git a/testsuite/escript/switch/switch19-duplicate-integer.err1 b/testsuite/escript/switch/switch19-duplicate-integer.err1
diff --git a/testsuite/escript/syntax/syntax01.err2 → testsuite/escript/syntax/syntax01.err b/testsuite/escript/syntax/syntax01.err2 → testsuite/escript/syntax/syntax01.err
diff --git a/testsuite/escript/syntax/syntax01.err1 b/testsuite/escript/syntax/syntax01.err1
diff --git a/testsuite/escript/syntax/syntax02.err2 → testsuite/escript/syntax/syntax02.err b/testsuite/escript/syntax/syntax02.err2 → testsuite/escript/syntax/syntax02.err
diff --git a/testsuite/escript/syntax/syntax02.err1 b/testsuite/escript/syntax/syntax02.err1
diff --git a/testsuite/escript/syntax/syntax03.err2 → testsuite/escript/syntax/syntax03.err b/testsuite/escript/syntax/syntax03.err2 → testsuite/escript/syntax/syntax03.err
diff --git a/testsuite/escript/syntax/syntax03.err1 b/testsuite/escript/syntax/syntax03.err1
diff --git a/testsuite/escript/array/array14.err2 → testsuite/escript/syntax/syntax04.err b/testsuite/escript/array/array14.err2 → testsuite/escript/syntax/syntax04.err
diff --git a/testsuite/escript/syntax/syntax04.err1 b/testsuite/escript/syntax/syntax04.err1
diff --git a/testsuite/escript/syntax/syntax04.err2 b/testsuite/escript/syntax/syntax04.err2
diff --git a/testsuite/escript/syntax/syntax05.err2 → testsuite/escript/syntax/syntax05.err b/testsuite/escript/syntax/syntax05.err2 → testsuite/escript/syntax/syntax05.err
diff --git a/testsuite/escript/syntax/syntax05.err1 b/testsuite/escript/syntax/syntax05.err1
diff --git a/testsuite/escript/syntax/syntax06.err2 → testsuite/escript/syntax/syntax06.err b/testsuite/escript/syntax/syntax06.err2 → testsuite/escript/syntax/syntax06.err
diff --git a/testsuite/escript/syntax/syntax06.err1 b/testsuite/escript/syntax/syntax06.err1
diff --git a/testsuite/escript/syntax/syntax07.err2 → testsuite/escript/syntax/syntax07.err b/testsuite/escript/syntax/syntax07.err2 → testsuite/escript/syntax/syntax07.err
diff --git a/testsuite/escript/syntax/syntax07.err1 b/testsuite/escript/syntax/syntax07.err1
diff --git a/testsuite/escript/syntax/syntax09.err2 → testsuite/escript/syntax/syntax09.err b/testsuite/escript/syntax/syntax09.err2 → testsuite/escript/syntax/syntax09.err
diff --git a/testsuite/escript/syntax/syntax09.err1 b/testsuite/escript/syntax/syntax09.err1
diff --git a/testsuite/escript/syntax/syntax10.err2 → testsuite/escript/syntax/syntax10.err b/testsuite/escript/syntax/syntax10.err2 → testsuite/escript/syntax/syntax10.err
diff --git a/testsuite/escript/syntax/syntax10.err1 b/testsuite/escript/syntax/syntax10.err1
diff --git a/.../syntax/syntax11-final-semi-required.err2 → ...t/syntax/syntax11-final-semi-required.err b/.../syntax/syntax11-final-semi-required.err2 → ...t/syntax/syntax11-final-semi-required.err
diff --git a/testsuite/escript/syntax/syntax11-final-semi-required.err1 b/testsuite/escript/syntax/syntax11-final-semi-required.err1
diff --git a/...tax/syntax12-unterminated-expression.err2 → ...ntax/syntax12-unterminated-expression.err b/...tax/syntax12-unterminated-expression.err2 → ...ntax/syntax12-unterminated-expression.err
diff --git a/testsuite/escript/syntax/syntax12-unterminated-expression.err1 b/testsuite/escript/syntax/syntax12-unterminated-expression.err1
diff --git a/testsuite/escript/var/var001.err2 → testsuite/escript/var/var001.err b/testsuite/escript/var/var001.err2 → testsuite/escript/var/var001.err
diff --git a/testsuite/escript/var/var001.err1 b/testsuite/escript/var/var001.err1