Index: test-suite/trunk/MicroBenchmarks/XRay/CMakeLists.txt
===================================================================
--- test-suite/trunk/MicroBenchmarks/XRay/CMakeLists.txt
+++ test-suite/trunk/MicroBenchmarks/XRay/CMakeLists.txt
@@ -3,11 +3,21 @@
   file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
 
   list(APPEND CPPFLAGS -std=c++11 -Wl,--gc-sections -fxray-instrument)
-  set(Source retref-bench.cc)
   list(APPEND LDFLAGS -fxray-instrument)
-  set(RUN_OPTIONS --benchmark_repetitions=10 --benchmark_report_aggregates_only=true)
-
-  set(PROG retref-bench)
-  llvm_multisource()
+  llvm_test_run(--benchmark_filter=dummy_skip_ignore)
+  llvm_test_executable(retref-bench retref-bench.cc)
   target_link_libraries(retref-bench benchmark)
+
+  file(COPY retref-bench_BM_ReturnNeverInstrumented.test
+       DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY retref-bench_BM_ReturnInstrumentedUnPatched.test
+       DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY retref-bench_BM_ReturnInstrumentedPatchedThenUnpatched.test
+       DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY retref-bench_BM_ReturnInstrumentedPatched.test
+       DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY retref-bench_BM_RDTSCP_Cost.test
+       DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY retref-bench_BM_ReturnInstrumentedPatchedWithLogHandler.test
+       DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
 endif()
Index: test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_RDTSCP_Cost.test
===================================================================
--- test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_RDTSCP_Cost.test
+++ test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_RDTSCP_Cost.test
@@ -0,0 +1 @@
+RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_RDTSCP_Cost
Index: test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatched.test
===================================================================
--- test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatched.test
+++ test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatched.test
@@ -0,0 +1 @@
+RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_ReturnInstrumentedPatched
Index: test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedThenUnpatched.test
===================================================================
--- test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedThenUnpatched.test
+++ test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedThenUnpatched.test
@@ -0,0 +1 @@
+RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_ReturnInstrumentedPatchedThenUnpatched
Index: test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedWithLogHandler.test
===================================================================
--- test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedWithLogHandler.test
+++ test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedPatchedWithLogHandler.test
@@ -0,0 +1 @@
+RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_ReturnInstrumentedPatchedWithLogHandler
Index: test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedUnPatched.test
===================================================================
--- test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedUnPatched.test
+++ test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnInstrumentedUnPatched.test
@@ -0,0 +1 @@
+RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_ReturnInstrumentedUnPatched
Index: test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnNeverInstrumented.test
===================================================================
--- test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnNeverInstrumented.test
+++ test-suite/trunk/MicroBenchmarks/XRay/retref-bench_BM_ReturnNeverInstrumented.test
@@ -0,0 +1 @@
+RUN: %S/retref-bench --benchmark_repetitions=10 --benchmark_report_aggregates_only=true --benchmark_filter=BM_ReturnNeverInstrumented