[Pkg-gnupg-commit] [gnupg2] 94/132: tests: Fix Python detection.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit ef1922b3b19df0aa7f8c15d503c603f76fc13f82
Author: Justus Winter <justus at g10code.com>
Date:   Mon Apr 24 17:32:41 2017 +0200

    tests: Fix Python detection.
    
    * tests/gpgme/gpgme-defs.scm (python): Fix Python detection.
    --
    In 25e6444b3f4601c7821beab06bc4520deacb007b we changed the way GPGME
    creates the build directory for the Python bindings.  We now use the
    basename of the interpreter as an identifier, that means we have to
    get the base name right, a link to the same binary is not sufficient.
    
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 tests/gpgme/gpgme-defs.scm | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/tests/gpgme/gpgme-defs.scm b/tests/gpgme/gpgme-defs.scm
index 690d097..a74a174 100644
--- a/tests/gpgme/gpgme-defs.scm
+++ b/tests/gpgme/gpgme-defs.scm
@@ -167,13 +167,15 @@
 	     (expand-one (append acc (list (car v))) (cdr v))))))
 	values)))
 
-(define python (catch #f
-		      (path-expand "python" (string-split (getenv "PATH") *pathsep*))))
+(define python
+  (let loop ((pythons (list "python" "python2" "python3")))
+    (if (null? pythons)
+	#f
+	(catch (loop (cdr pythons))
+	       (unless (file-exists? (path-join gpgme-builddir "lang" "python"
+						(string-append (car pythons) "-gpg")))
+		       (throw "next please"))
+	       (path-expand (car pythons) (string-split (getenv "PATH") *pathsep*))))))
+
 (define (run-python-tests?)
-  (and python
-       (let* ((python-version
-	       (string-trim char-whitespace?
-			    (call-popen `(,python -c "import sys; print('{0}.{1}'.format(sys.version_info[0], sys.version_info[1]))") "")))
-	      (build-path (path-join gpgme-builddir "lang" "python"
-				     (string-append "python" python-version "-gpg"))))
-	 (file-exists? build-path))))
+  (not (not python)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git