parent
40a4222996
commit
1444f47deb
|
@ -202,15 +202,15 @@ elseif (LLVM_NATIVE_ARCH MATCHES "xcore")
|
||||||
elseif (LLVM_NATIVE_ARCH MATCHES "msp430")
|
elseif (LLVM_NATIVE_ARCH MATCHES "msp430")
|
||||||
set(LLVM_NATIVE_ARCH MSP430)
|
set(LLVM_NATIVE_ARCH MSP430)
|
||||||
else ()
|
else ()
|
||||||
message(STATUS
|
message(STATUS
|
||||||
"Unknown architecture ${LLVM_NATIVE_ARCH}; lli will not JIT code")
|
"Unknown architecture ${LLVM_NATIVE_ARCH}; lli will not JIT code")
|
||||||
set(LLVM_NATIVE_ARCH)
|
set(LLVM_NATIVE_ARCH)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (LLVM_NATIVE_ARCH)
|
if (LLVM_NATIVE_ARCH)
|
||||||
list(FIND LLVM_TARGETS_TO_BUILD ${LLVM_NATIVE_ARCH} NATIVE_ARCH_IDX)
|
list(FIND LLVM_TARGETS_TO_BUILD ${LLVM_NATIVE_ARCH} NATIVE_ARCH_IDX)
|
||||||
if (NATIVE_ARCH_IDX EQUAL -1)
|
if (NATIVE_ARCH_IDX EQUAL -1)
|
||||||
message(STATUS
|
message(STATUS
|
||||||
"Native target ${LLVM_NATIVE_ARCH} is not selected; lli will not JIT code")
|
"Native target ${LLVM_NATIVE_ARCH} is not selected; lli will not JIT code")
|
||||||
set(LLVM_NATIVE_ARCH)
|
set(LLVM_NATIVE_ARCH)
|
||||||
else ()
|
else ()
|
||||||
|
|
|
@ -18,7 +18,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||||
else() # Default for all other unix like systems.
|
else() # Default for all other unix like systems.
|
||||||
# CMake hardcodes the library locaction using rpath.
|
# CMake hardcodes the library locaction using rpath.
|
||||||
# Therefore LD_LIBRARY_PATH is not required to run binaries in the
|
# Therefore LD_LIBRARY_PATH is not required to run binaries in the
|
||||||
# build dir. We pass it anyways.
|
# build dir. We pass it anyways.
|
||||||
set(SHLIBPATH_VAR "LD_LIBRARY_PATH")
|
set(SHLIBPATH_VAR "LD_LIBRARY_PATH")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ class GoogleTest(object):
|
||||||
index += 1
|
index += 1
|
||||||
while len(nested_tests) > index:
|
while len(nested_tests) > index:
|
||||||
nested_tests.pop()
|
nested_tests.pop()
|
||||||
|
|
||||||
ln = ln[index*2:]
|
ln = ln[index*2:]
|
||||||
if ln.endswith('.'):
|
if ln.endswith('.'):
|
||||||
nested_tests.append(ln)
|
nested_tests.append(ln)
|
||||||
|
@ -84,7 +84,7 @@ class GoogleTest(object):
|
||||||
|
|
||||||
out, err, exitCode = TestRunner.executeCommand(
|
out, err, exitCode = TestRunner.executeCommand(
|
||||||
cmd, env=test.config.environment)
|
cmd, env=test.config.environment)
|
||||||
|
|
||||||
if not exitCode:
|
if not exitCode:
|
||||||
return Test.PASS,''
|
return Test.PASS,''
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue