Make embed test more debuggable by printing the path setup and the build output on failure.

2 files changed, 30 insertions, 5 deletions

diff --git a/Demos/embed/Makefile b/Demos/embed/Makefile
index e8d40b999..e6af8cae8 100644
--- a/Demos/embed/Makefile
+++ b/Demos/embed/Makefile
@@ -15,6 +15,23 @@ LINKFORSHARED := $(shell $(PYTHON) -c "import distutils.sysconfig; print(distuti
 LIBS := $(shell $(PYTHON) -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBS'))")
 SYSLIBS :=  $(shell $(PYTHON) -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('SYSLIBS'))")
 
+.PHONY: paths all clean test
+
+paths:
+	@echo "PYTHON=$(PYTHON)"
+	@echo "PYVERSION=$(PYVERSION)"
+	@echo "PYPREFIX=$(PYPREFIX)"
+	@echo "INCDIR=$(INCDIR)"
+	@echo "PLATINCDIR=$(PLATINCDIR)"
+	@echo "LIBDIR1=$(LIBDIR1)"
+	@echo "LIBDIR2=$(LIBDIR2)"
+	@echo "PYLIB=$(PYLIB)"
+	@echo "CC=$(CC)"
+	@echo "LINKCC=$(LINKCC)"
+	@echo "LINKFORSHARED=$(LINKFORSHARED)"
+	@echo "LIBS=$(LIBS)"
+	@echo "SYSLIBS=$(SYSLIBS)"
+
 embedded: embedded.o
 	$(LINKCC) -o $@ $^ -L$(LIBDIR1) -L$(LIBDIR2) -l$(PYLIB) $(LIBS) $(SYSLIBS) $(LINKFORSHARED)
 
diff --git a/runtests.py b/runtests.py
index f12fe38a9..cadfd34e1 100755
--- a/runtests.py
+++ b/runtests.py
@@ -1826,12 +1826,20 @@ class EmbedTest(unittest.TestCase):
         if sys.version_info[0] >=3 and CY3_DIR:
             cython = os.path.join(CY3_DIR, cython)
         cython = os.path.abspath(os.path.join('..', '..', cython))
-        self.assertEqual(0, os.system(
-            "make PYTHON='%s' CYTHON='%s' LIBDIR1='%s' test > make.output" % (sys.executable, cython, libdir)))
+
         try:
-            os.remove('make.output')
-        except OSError:
-            pass
+            subprocess.check_output([
+                "make",
+                "PYTHON='%s'" % sys.executable,
+                "CYTHON='%s'" % cython,
+                "LIBDIR1='%s'" % libdir,
+                "paths", "test",
+            ])
+        except subprocess.CalledProcessError as err:
+            print(err.output.decode())
+            raise
+        self.assertTrue(True)  # :)
+
 
 def load_listfile(filename):
     # just re-use the FileListExclude implementation