Follow-up to r152620: restore JIT event listener tests to unittest/ExecutionEngine/JIT

llvm-svn: 152780

1 files changed, 8 insertions, 8 deletions

diff --git a/llvm/unittests/CMakeLists.txt b/llvm/unittests/CMakeLists.txt
index 648a1d86254..60423f25c25 100644
--- a/llvm/unittests/CMakeLists.txt
+++ b/llvm/unittests/CMakeLists.txt
@@ -83,11 +83,15 @@ add_llvm_unittest(Analysis
   Analysis/ScalarEvolutionTest.cpp
   )
 
+add_llvm_unittest(ExecutionEngine
+  ExecutionEngine/ExecutionEngineTest.cpp
+  )
+
 if( LLVM_USE_INTEL_JITEVENTS )
   include_directories( ${LLVM_INTEL_JITEVENTS_INCDIR} )
   link_directories( ${LLVM_INTEL_JITEVENTS_LIBDIR} )
   set(ProfileTestSources
-    ExecutionEngine/IntelJITEventListenerTest.cpp
+    ExecutionEngine/JIT/IntelJITEventListenerTest.cpp
     )
   set(LLVM_LINK_COMPONENTS
     ${LLVM_LINK_COMPONENTS}
@@ -98,7 +102,7 @@ endif( LLVM_USE_INTEL_JITEVENTS )
 if( LLVM_USE_OPROFILE )
   set(ProfileTestSources
     ${ProfileTestSources}
-    ExecutionEngine/OProfileJITEventListenerTest.cpp
+    ExecutionEngine/JIT/OProfileJITEventListenerTest.cpp
     )
   set(LLVM_LINK_COMPONENTS
     ${LLVM_LINK_COMPONENTS}
@@ -106,16 +110,12 @@ if( LLVM_USE_OPROFILE )
     )
 endif( LLVM_USE_OPROFILE )
 
-add_llvm_unittest(ExecutionEngine
-  ExecutionEngine/ExecutionEngineTest.cpp
-  ExecutionEngine/JITEventListenerTest.cpp
-  ${ProfileTestSources}
-  )
-
 set(JITTestsSources
+  ExecutionEngine/JIT/JITEventListenerTest.cpp
   ExecutionEngine/JIT/JITMemoryManagerTest.cpp
   ExecutionEngine/JIT/JITTest.cpp
   ExecutionEngine/JIT/MultiJITTest.cpp
+  ${ProfileTestSources}
   )
 
 if(MSVC)