about summary refs log tree commit diff homepage
path: root/test/Makefile
diff options
context:
space:
mode:
authorDan Liew <daniel.liew@imperial.ac.uk>2014-01-13 18:53:06 +0000
committerDan Liew <daniel.liew@imperial.ac.uk>2014-01-20 14:46:52 +0000
commitb58f5e78a9f3c161f7c8589bf5430a36ee33baf6 (patch)
tree552f8c8ec2257192d79741fa110d9f37014b54ba /test/Makefile
parent8a460a94c6a442e22187e8b5b3560bed34460f4b (diff)
downloadklee-b58f5e78a9f3c161f7c8589bf5430a36ee33baf6.tar.gz
Partially fix python detection for running llvm-lit.
The problem is newer LLVM versions (e.g. 3.3) detect python at
their configure time whereas older versions don't (i.e. 2.9). So
I don't want to add python detection to KLEE's configure if LLVM
already does the work for us. We need to move off llvm 2.9 anyway.
Diffstat (limited to 'test/Makefile')
-rw-r--r--test/Makefile13
1 files changed, 9 insertions, 4 deletions
diff --git a/test/Makefile b/test/Makefile
index c27ffad3..a60c82cb 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -36,18 +36,23 @@ else
 LIT_TESTSUITE := .
 endif
 
+# Older LLVM versions don't detect python at configure time
+# so guess the location
+ifndef PYTHON
+	# llvm-lit doesn't work with python3 so force python2
+	PYTHON := python2
+endif
+
 # Potential support in the future for multiple test suites
 LIT_ALL_TESTSUITES := $(LIT_TESTSUITE)
 
 check-local:: lit.site.cfg
-	# FIXME: Detect python at configure time
 	( $(ULIMIT) \
-	  python2 $(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_TESTSUITE) )
+	  $(PYTHON) $(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_TESTSUITE) )
 
 check-local-all:: lit.site.cfg
-	# FIXME: Detect python at configure time
 	( $(ULIMIT) \
-	  python2 $(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_ALL_TESTSUITES) )
+	  $(PYTHON) $(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_ALL_TESTSUITES) )
 
 clean::
 	$(RM) -rf `find $(PROJ_OBJ_ROOT)/test -name Output -type d -print`