diff options
| author | Eli Bendersky <eli.bendersky@intel.com> | 2012-03-15 06:49:31 +0000 |
|---|---|---|
| committer | Eli Bendersky <eli.bendersky@intel.com> | 2012-03-15 06:49:31 +0000 |
| commit | f963cd3e02cc01453cb9fd1d4f9e20a1e6f97ba2 (patch) | |
| tree | 53a54bcb7adc99f82e370ba987359579e183a694 /unittests/ExecutionEngine | |
| parent | 5a89434236a4d6ad5fa6a570cbf3e717b757a148 (diff) | |
| download | llvm-f963cd3e02cc01453cb9fd1d4f9e20a1e6f97ba2.tar.gz llvm-f963cd3e02cc01453cb9fd1d4f9e20a1e6f97ba2.tar.bz2 llvm-f963cd3e02cc01453cb9fd1d4f9e20a1e6f97ba2.tar.xz | |
Follow-up to r152620: restore JIT event listener tests to unittest/ExecutionEngine/JIT
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@152780 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests/ExecutionEngine')
| -rw-r--r-- | unittests/ExecutionEngine/JIT/IntelJITEventListenerTest.cpp (renamed from unittests/ExecutionEngine/IntelJITEventListenerTest.cpp) | 0 | ||||
| -rw-r--r-- | unittests/ExecutionEngine/JIT/JITEventListenerTest.cpp (renamed from unittests/ExecutionEngine/JITEventListenerTest.cpp) | 0 | ||||
| -rw-r--r-- | unittests/ExecutionEngine/JIT/JITEventListenerTestCommon.h (renamed from unittests/ExecutionEngine/JITEventListenerTestCommon.h) | 0 | ||||
| -rw-r--r-- | unittests/ExecutionEngine/JIT/Makefile | 23 | ||||
| -rw-r--r-- | unittests/ExecutionEngine/JIT/OProfileJITEventListenerTest.cpp (renamed from unittests/ExecutionEngine/OProfileJITEventListenerTest.cpp) | 0 | ||||
| -rw-r--r-- | unittests/ExecutionEngine/Makefile | 27 |
6 files changed, 24 insertions, 26 deletions
diff --git a/unittests/ExecutionEngine/IntelJITEventListenerTest.cpp b/unittests/ExecutionEngine/JIT/IntelJITEventListenerTest.cpp index 8ed7a15be3..8ed7a15be3 100644 --- a/unittests/ExecutionEngine/IntelJITEventListenerTest.cpp +++ b/unittests/ExecutionEngine/JIT/IntelJITEventListenerTest.cpp diff --git a/unittests/ExecutionEngine/JITEventListenerTest.cpp b/unittests/ExecutionEngine/JIT/JITEventListenerTest.cpp index f8d88301ba..f8d88301ba 100644 --- a/unittests/ExecutionEngine/JITEventListenerTest.cpp +++ b/unittests/ExecutionEngine/JIT/JITEventListenerTest.cpp diff --git a/unittests/ExecutionEngine/JITEventListenerTestCommon.h b/unittests/ExecutionEngine/JIT/JITEventListenerTestCommon.h index 53608cbfce..53608cbfce 100644 --- a/unittests/ExecutionEngine/JITEventListenerTestCommon.h +++ b/unittests/ExecutionEngine/JIT/JITEventListenerTestCommon.h diff --git a/unittests/ExecutionEngine/JIT/Makefile b/unittests/ExecutionEngine/JIT/Makefile index f5abe75a8f..b429033b19 100644 --- a/unittests/ExecutionEngine/JIT/Makefile +++ b/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/unittests/ExecutionEngine/OProfileJITEventListenerTest.cpp b/unittests/ExecutionEngine/JIT/OProfileJITEventListenerTest.cpp index 9b0ee60992..9b0ee60992 100644 --- a/unittests/ExecutionEngine/OProfileJITEventListenerTest.cpp +++ b/unittests/ExecutionEngine/JIT/OProfileJITEventListenerTest.cpp diff --git a/unittests/ExecutionEngine/Makefile b/unittests/ExecutionEngine/Makefile index ffa05be87d..a0395cdad3 100644 --- a/unittests/ExecutionEngine/Makefile +++ b/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 |