[libcxx][test] Use python specified by build rather than system default python
authorLeonard Chan <leonardchan@google.com>
Thu, 30 Sep 2021 22:34:30 +0000 (15:34 -0700)
committerLeonard Chan <leonardchan@google.com>
Thu, 30 Sep 2021 22:34:30 +0000 (15:34 -0700)
As of e9564c3698edffc64439a8f957c7c28b19214613, libcxx/gdb/gdb_pretty_printer_test.sh.cpp
fails locally for me because the REQUIRES check for host-has-gdb-with-python
uses python, which for me expands to python 2.7.18. This failure does not seem
to be caught on any upstream builders, potentially because they don't have gdb,
python, or a version of python that makes the test UNSUPPORTED (like python3).

This updates the check to use the python specified by the build (which should
be the python that runs this code), rather than just python.

Differential Revision: https://reviews.llvm.org/D110887

libcxx/utils/libcxx/test/features.py

index 1204304..94e4490 100644 (file)
@@ -179,7 +179,7 @@ gdb.execute(\"quit\")"""
 
   try:
     stdout = subprocess.check_output(
-              [gdb_path, "-ex", "python " + test_src, "--batch"],
+              [gdb_path, "-ex", sys.executable + " " + test_src, "--batch"],
               stderr=subprocess.DEVNULL, universal_newlines=True)
   except subprocess.CalledProcessError:
     # We can't set breakpoint commands