17 files changed, 51 insertions, 45 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7e006815..4399dad0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,46 +1,5 @@
-include_directories(${FLTK_INCLUDE_DIR})
-include_directories(${GETTEXT_INCLUDE_DIR})
+# Benchmarking tools
+add_subdirectory(perf)
 
-include_directories(${CMAKE_SOURCE_DIR}/common)
-
-add_library(test_util STATIC util.cxx)
-
-add_executable(convperf convperf.cxx)
-target_link_libraries(convperf test_util rfb)
-
-add_executable(conv conv.cxx)
-target_link_libraries(conv rfb)
-
-add_executable(decperf decperf.cxx)
-target_link_libraries(decperf test_util rfb)
-
-add_executable(encperf encperf.cxx)
-target_link_libraries(encperf test_util rfb)
-
-add_executable(hostport hostport.cxx)
-target_link_libraries(hostport rfb)
-
-set(FBPERF_SOURCES
-  fbperf.cxx
-  ../vncviewer/PlatformPixelBuffer.cxx
-  ../vncviewer/Surface.cxx)
-if(WIN32)
-  set(FBPERF_SOURCES ${FBPERF_SOURCES} ../vncviewer/Surface_Win32.cxx)
-elseif(APPLE)
-  set(FBPERF_SOURCES
-      ${FBPERF_SOURCES} ../vncviewer/Surface_OSX.cxx
-      ${FBPERF_SOURCES} ../vncviewer/keysym2ucs.c
-      ${FBPERF_SOURCES} ../vncviewer/cocoa.mm)
-else()
-  set(FBPERF_SOURCES ${FBPERF_SOURCES} ../vncviewer/Surface_X11.cxx)
-endif()
-add_executable(fbperf ${FBPERF_SOURCES})
-target_link_libraries(fbperf test_util rfb ${FLTK_LIBRARIES} ${GETTEXT_LIBRARIES})
-if(WIN32)
-  target_link_libraries(fbperf msimg32)
-endif()
-if(APPLE)
-  target_link_libraries(fbperf "-framework Cocoa")
-  target_link_libraries(fbperf "-framework Carbon")
-  target_link_libraries(fbperf "-framework IOKit")
-endif()
+# Unit tests
+add_subdirectory(unit)
diff --git a/tests/perf/CMakeLists.txt b/tests/perf/CMakeLists.txt
new file mode 100644
index 00000000..053bfaae
--- /dev/null
+++ b/tests/perf/CMakeLists.txt
@@ -0,0 +1,40 @@
+include_directories(${FLTK_INCLUDE_DIR})
+include_directories(${GETTEXT_INCLUDE_DIR})
+
+include_directories(${CMAKE_SOURCE_DIR}/common)
+
+add_library(test_util STATIC util.cxx)
+
+add_executable(convperf convperf.cxx)
+target_link_libraries(convperf test_util rfb)
+
+add_executable(decperf decperf.cxx)
+target_link_libraries(decperf test_util rfb)
+
+add_executable(encperf encperf.cxx)
+target_link_libraries(encperf test_util rfb)
+
+set(FBPERF_SOURCES
+  fbperf.cxx
+  ${CMAKE_SOURCE_DIR}/vncviewer/PlatformPixelBuffer.cxx
+  ${CMAKE_SOURCE_DIR}/vncviewer/Surface.cxx)
+if(WIN32)
+  set(FBPERF_SOURCES ${FBPERF_SOURCES} ${CMAKE_SOURCE_DIR}/vncviewer/Surface_Win32.cxx)
+elseif(APPLE)
+  set(FBPERF_SOURCES
+      ${FBPERF_SOURCES} ${CMAKE_SOURCE_DIR}/vncviewer/Surface_OSX.cxx
+      ${FBPERF_SOURCES} ${CMAKE_SOURCE_DIR}/vncviewer/keysym2ucs.c
+      ${FBPERF_SOURCES} ${CMAKE_SOURCE_DIR}/vncviewer/cocoa.mm)
+else()
+  set(FBPERF_SOURCES ${FBPERF_SOURCES} ${CMAKE_SOURCE_DIR}/vncviewer/Surface_X11.cxx)
+endif()
+add_executable(fbperf ${FBPERF_SOURCES})
+target_link_libraries(fbperf test_util rfb ${FLTK_LIBRARIES} ${GETTEXT_LIBRARIES})
+if(WIN32)
+  target_link_libraries(fbperf msimg32)
+endif()
+if(APPLE)
+  target_link_libraries(fbperf "-framework Cocoa")
+  target_link_libraries(fbperf "-framework Carbon")
+  target_link_libraries(fbperf "-framework IOKit")
+endif()
diff --git a/tests/convperf.cxx b/tests/perf/convperf.cxx
index e4a3fd52..e4a3fd52 100644
--- a/tests/convperf.cxx
+++ b/tests/perf/convperf.cxx
diff --git a/tests/decperf.cxx b/tests/perf/decperf.cxx
index df5214f2..df5214f2 100644
--- a/tests/decperf.cxx
+++ b/tests/perf/decperf.cxx
diff --git a/tests/encperf.cxx b/tests/perf/encperf.cxx
index e461197e..e461197e 100644
--- a/tests/encperf.cxx
+++ b/tests/perf/encperf.cxx
diff --git a/tests/fbperf.cxx b/tests/perf/fbperf.cxx
index a19ee479..a19ee479 100644
--- a/tests/fbperf.cxx
+++ b/tests/perf/fbperf.cxx
diff --git a/tests/results/multicore/README b/tests/perf/results/multicore/README
index c93b2d7a..c93b2d7a 100644
--- a/tests/results/multicore/README
+++ b/tests/perf/results/multicore/README
diff --git a/tests/results/multicore/multicore.ods b/tests/perf/results/multicore/multicore.ods
index 42e024d6..42e024d6 100644
--- a/tests/results/multicore/multicore.ods
+++ b/tests/perf/results/multicore/multicore.ods
diff --git a/tests/results/notrans/README b/tests/perf/results/notrans/README
index 3723e67d..3723e67d 100644
--- a/tests/results/notrans/README
+++ b/tests/perf/results/notrans/README
diff --git a/tests/results/notrans/armhf.csv b/tests/perf/results/notrans/armhf.csv
index 3ccb6d9b..3ccb6d9b 100644
--- a/tests/results/notrans/armhf.csv
+++ b/tests/perf/results/notrans/armhf.csv
diff --git a/tests/results/notrans/i386.csv b/tests/perf/results/notrans/i386.csv
index bb9247d3..bb9247d3 100644
--- a/tests/results/notrans/i386.csv
+++ b/tests/perf/results/notrans/i386.csv
diff --git a/tests/results/notrans/x86_64.csv b/tests/perf/results/notrans/x86_64.csv
index 18fc03f3..18fc03f3 100644
--- a/tests/results/notrans/x86_64.csv
+++ b/tests/perf/results/notrans/x86_64.csv
diff --git a/tests/util.cxx b/tests/perf/util.cxx
index 17a83698..17a83698 100644
--- a/tests/util.cxx
+++ b/tests/perf/util.cxx
diff --git a/tests/util.h b/tests/perf/util.h
index 2b8ab4a8..2b8ab4a8 100644
--- a/tests/util.h
+++ b/tests/perf/util.h
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
new file mode 100644
index 00000000..656c8a75
--- /dev/null
+++ b/tests/unit/CMakeLists.txt
@@ -0,0 +1,7 @@
+include_directories(${CMAKE_SOURCE_DIR}/common)
+
+add_executable(conv conv.cxx)
+target_link_libraries(conv rfb)
+
+add_executable(hostport hostport.cxx)
+target_link_libraries(hostport rfb)
diff --git a/tests/conv.cxx b/tests/unit/conv.cxx
index 3901b9d1..3901b9d1 100644
--- a/tests/conv.cxx
+++ b/tests/unit/conv.cxx
diff --git a/tests/hostport.cxx b/tests/unit/hostport.cxx
index 00026e61..00026e61 100644
--- a/tests/hostport.cxx
+++ b/tests/unit/hostport.cxx