Index: test-suite/trunk/CMakeLists.txt
===================================================================
--- test-suite/trunk/CMakeLists.txt
+++ test-suite/trunk/CMakeLists.txt
@@ -178,7 +178,9 @@
   set(TEST_SUITE_SUBDIRS "")
   foreach(entry ${sub_cmakelists})
     get_filename_component(subdir ${entry} DIRECTORY)
-    if(NOT ${subdir} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/tools)
+    # Exclude tools and CTMark from default list
+    if(NOT ${subdir} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/tools AND
+       NOT ${subdir} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/CTMark)
       list(APPEND TEST_SUITE_SUBDIRS ${subdir})
     endif()
   endforeach()
Index: test-suite/trunk/CTMark/7zip
===================================================================
--- test-suite/trunk/CTMark/7zip
+++ test-suite/trunk/CTMark/7zip
@@ -0,0 +1 @@
+link ../MultiSource/Benchmarks/7zip
\ No newline at end of file
Index: test-suite/trunk/CTMark/Bullet
===================================================================
--- test-suite/trunk/CTMark/Bullet
+++ test-suite/trunk/CTMark/Bullet
@@ -0,0 +1 @@
+link ../MultiSource/Benchmarks/Bullet
\ No newline at end of file
Index: test-suite/trunk/CTMark/CMakeLists.txt
===================================================================
--- test-suite/trunk/CTMark/CMakeLists.txt
+++ test-suite/trunk/CTMark/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_subdirectory(7zip)
+add_subdirectory(Bullet)
+add_subdirectory(tramp3d-v4)
+add_subdirectory(kimwitu++)
+add_subdirectory(lencod)
+add_subdirectory(SPASS)
+add_subdirectory(ClamAV)
+add_subdirectory(sqlite3)
+add_subdirectory(consumer-typeset)
+add_subdirectory(mafft)
Index: test-suite/trunk/CTMark/ClamAV
===================================================================
--- test-suite/trunk/CTMark/ClamAV
+++ test-suite/trunk/CTMark/ClamAV
@@ -0,0 +1 @@
+link ../MultiSource/Applications/ClamAV
\ No newline at end of file
Index: test-suite/trunk/CTMark/README.md
===================================================================
--- test-suite/trunk/CTMark/README.md
+++ test-suite/trunk/CTMark/README.md
@@ -0,0 +1,13 @@
+Compile Time Mark
+=================
+
+This is a collection of applications used for compiler performance testing. It
+currently features a selection of larger applications from the test-suite.
+
+You can use this with:
+$ cmake -DTEST_SUITE_SUBDIRS=CTMark ...
+
+See also:
+
+- http://lab.llvm.org:8080/green/view/Compile%20Time/
+- http://lists.llvm.org/pipermail/llvm-dev/2016-November/107087.html
Index: test-suite/trunk/CTMark/SPASS
===================================================================
--- test-suite/trunk/CTMark/SPASS
+++ test-suite/trunk/CTMark/SPASS
@@ -0,0 +1 @@
+link ../MultiSource/Applications/SPASS
\ No newline at end of file
Index: test-suite/trunk/CTMark/consumer-typeset
===================================================================
--- test-suite/trunk/CTMark/consumer-typeset
+++ test-suite/trunk/CTMark/consumer-typeset
@@ -0,0 +1 @@
+link ../MultiSource/Benchmarks/MiBench/consumer-typeset
\ No newline at end of file
Index: test-suite/trunk/CTMark/kimwitu++
===================================================================
--- test-suite/trunk/CTMark/kimwitu++
+++ test-suite/trunk/CTMark/kimwitu++
@@ -0,0 +1 @@
+link ../MultiSource/Applications/kimwitu++
\ No newline at end of file
Index: test-suite/trunk/CTMark/lencod
===================================================================
--- test-suite/trunk/CTMark/lencod
+++ test-suite/trunk/CTMark/lencod
@@ -0,0 +1 @@
+link ../MultiSource/Applications/JM/lencod
\ No newline at end of file
Index: test-suite/trunk/CTMark/mafft
===================================================================
--- test-suite/trunk/CTMark/mafft
+++ test-suite/trunk/CTMark/mafft
@@ -0,0 +1 @@
+link ../MultiSource/Benchmarks/mafft
\ No newline at end of file
Index: test-suite/trunk/CTMark/sqlite3
===================================================================
--- test-suite/trunk/CTMark/sqlite3
+++ test-suite/trunk/CTMark/sqlite3
@@ -0,0 +1 @@
+link ../MultiSource/Applications/sqlite3
\ No newline at end of file
Index: test-suite/trunk/CTMark/tramp3d-v4
===================================================================
--- test-suite/trunk/CTMark/tramp3d-v4
+++ test-suite/trunk/CTMark/tramp3d-v4
@@ -0,0 +1 @@
+link ../MultiSource/Benchmarks/tramp3d-v4
\ No newline at end of file