Regression tests: synchronise Make/CMake test sequence

This is in the spirit of item 3 from #5986: we have again diverged in
the set of tests run by Makefile and CMake, respectively. This commit
aligns the ordering of tests to make for an easier visual comparison,
and adds the missing cbmc-output-file test to Make.

Author: tautschnig

regression/CMakeLists.txt

@@ -25,8 +25,11 @@ endmacro(add_test_pl_tests)
 # listed with decreasing runtimes (i.e. longest running at the top)
 add_subdirectory(cbmc)
 add_subdirectory(cbmc-library)
-add_subdirectory(goto-analyzer)
 add_subdirectory(cprover)
+if(NOT WIN32)
+  add_subdirectory(crangler)
+endif()
+add_subdirectory(goto-analyzer)
 add_subdirectory(ansi-c)
 add_subdirectory(goto-instrument)
 add_subdirectory(cpp)
@@ -80,15 +83,10 @@ add_subdirectory(cbmc-primitives)
 add_subdirectory(goto-interpreter)
 add_subdirectory(cbmc-sequentialization)
 add_subdirectory(cpp-linter)
+add_subdirectory(catch-framework)
 
 if(WITH_MEMORY_ANALYZER)
   add_subdirectory(snapshot-harness)
   add_subdirectory(memory-analyzer)
   add_subdirectory(extract_type_header)
 endif()
-
-if(NOT WIN32)
-  add_subdirectory(crangler)
-endif()
-
-add_subdirectory(catch-framework)

regression/Makefile

@@ -14,6 +14,7 @@ DIRS = cbmc \
        cbmc-incr-oneloop \
        cbmc-incr-smt2 \
        cbmc-incr \
+       cbmc-output-file \
        cbmc-with-incr \
        array-refinement-with-incr \
        goto-instrument-chc \