From: Carl Worth <cworth@cworth.org>
Date: Mon, 28 Jan 2013 20:22:31 +0000 (+1100)
Subject: Fix test to correctly use cmake feature to find python executable
X-Git-Url: https://git.cworth.org/git?p=apitrace-tests;a=commitdiff_plain;h=2234d55c7f6c9309d12c3a2a948a1b7f0e94b81a

Fix test to correctly use cmake feature to find python executable

On my system, at least, there was no ${python} variable set, so the
tests for PIL were incorrectly failing, (such that many tests were not
being run at all).

Signed-off-by: José Fonseca <jfonseca@vmware.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2dff857..d9398c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,7 @@ if (NOT EXISTS ${APITRACE_EXECUTABLE})
     message (WARNING "Please specify path to apitrace executable via APITRACE_EXECUTABLE")
 endif ()
 
+include (FindPythonInterp)
 include (FindPkgConfig)
 
 set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
@@ -50,7 +51,7 @@ endif ()
 # Check for the presence of several python packages, which are needed to build
 # generated tests.
 execute_process(
-    COMMAND ${python} -c "import PIL"
+    COMMAND ${PYTHON_EXECUTABLE} -c "import PIL"
     OUTPUT_QUIET
     ERROR_QUIET
     RESULT_VARIABLE IMPORT_PIL_RESULT)