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

llvm-svn: 152780

6 files changed, 24 insertions, 26 deletions

diff --git a/llvm/unittests/ExecutionEngine/IntelJITEventListenerTest.cpp b/llvm/unittests/ExecutionEngine/JIT/IntelJITEventListenerTest.cpp
index 8ed7a15be37..8ed7a15be37 100644
--- a/llvm/unittests/ExecutionEngine/IntelJITEventListenerTest.cpp
+++ b/llvm/unittests/ExecutionEngine/JIT/IntelJITEventListenerTest.cpp
diff --git a/llvm/unittests/ExecutionEngine/JITEventListenerTest.cpp b/llvm/unittests/ExecutionEngine/JIT/JITEventListenerTest.cpp
index f8d88301ba1..f8d88301ba1 100644
--- a/llvm/unittests/ExecutionEngine/JITEventListenerTest.cpp
+++ b/llvm/unittests/ExecutionEngine/JIT/JITEventListenerTest.cpp
diff --git a/llvm/unittests/ExecutionEngine/JITEventListenerTestCommon.h b/llvm/unittests/ExecutionEngine/JIT/JITEventListenerTestCommon.h
index 53608cbfce3..53608cbfce3 100644
--- a/llvm/unittests/ExecutionEngine/JITEventListenerTestCommon.h
+++ b/llvm/unittests/ExecutionEngine/JIT/JITEventListenerTestCommon.h
diff --git a/llvm/unittests/ExecutionEngine/JIT/Makefile b/llvm/unittests/ExecutionEngine/JIT/Makefile
index f5abe75a8f6..b429033b19b 100644
--- a/llvm/unittests/ExecutionEngine/JIT/Makefile
+++ b/llvm/unittests/ExecutionEngine/JIT/Makefile
@@ -12,6 +12,29 @@ TESTNAME = JIT
 LINK_COMPONENTS := asmparser bitreader bitwriter core jit native support
 
 include $(LEVEL)/Makefile.config
+
+SOURCES := JITEventListenerTest.cpp
+
+ifeq ($(USE_INTEL_JITEVENTS), 1)
+  # Build the Intel JIT Events interface tests
+  SOURCES += IntelJITEventListenerTest.cpp
+
+  # Add the Intel JIT Events include directory
+  CPPFLAGS += -I$(INTEL_JITEVENTS_INCDIR)
+
+  # Link against the LLVM Intel JIT Evens interface library
+  LINK_COMPONENTS += inteljitevents
+endif
+
+ifeq ($(USE_OPROFILE), 1)
+  # Build the OProfile JIT interface tests
+  SOURCES += OProfileJITEventListenerTest.cpp
+
+  # Link against the LLVM oprofile interface library
+  LINK_COMPONENTS += oprofilejit
+endif
+
+
 include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest
 
 # Permit these tests to use the JIT's symbolic lookup.
diff --git a/llvm/unittests/ExecutionEngine/OProfileJITEventListenerTest.cpp b/llvm/unittests/ExecutionEngine/JIT/OProfileJITEventListenerTest.cpp
index 9b0ee609923..9b0ee609923 100644
--- a/llvm/unittests/ExecutionEngine/OProfileJITEventListenerTest.cpp
+++ b/llvm/unittests/ExecutionEngine/JIT/OProfileJITEventListenerTest.cpp
diff --git a/llvm/unittests/ExecutionEngine/Makefile b/llvm/unittests/ExecutionEngine/Makefile
index ffa05be87d2..a0395cdad3b 100644
--- a/llvm/unittests/ExecutionEngine/Makefile
+++ b/llvm/unittests/ExecutionEngine/Makefile
@@ -10,32 +10,7 @@
 LEVEL = ../..
 TESTNAME = ExecutionEngine
 LINK_COMPONENTS := engine interpreter
-
-include $(LEVEL)/Makefile.config
-
-SOURCES := ExecutionEngineTest.cpp \
-  JITEventListenerTest.cpp
-
-ifeq ($(USE_INTEL_JITEVENTS), 1)
-  # Build the Intel JIT Events interface tests
-  SOURCES += IntelJITEventListenerTest.cpp
-
-  # Add the Intel JIT Events include directory
-  CPPFLAGS += -I$(INTEL_JITEVENTS_INCDIR)
-
-  # Link against the LLVM Intel JIT Evens interface library
-  LINK_COMPONENTS += inteljitevents
-endif
-
-ifeq ($(USE_OPROFILE), 1)
-  # Build the OProfile JIT interface tests
-  SOURCES += OProfileJITEventListenerTest.cpp
-
-  # Link against the LLVM oprofile interface library
-  LINK_COMPONENTS += oprofilejit
-endif
-
-
 PARALLEL_DIRS = JIT
 
+include $(LEVEL)/Makefile.config
 include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest