From d02a96ece4c4c57802b120762bbd1efb9debf827 Mon Sep 17 00:00:00 2001 From: Roman Yurchak Date: Sat, 9 May 2020 12:48:35 +0200 Subject: [PATCH] Fix Makefile syntax --- Makefile | 15 ++++++++------- test/test_common.py | 4 +--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 533e2f16f..92a33e34e 100644 --- a/Makefile +++ b/Makefile @@ -242,13 +242,14 @@ $(PARSO_LIBS): $(CPYTHONLIB) $(CLAPACK): $(CPYTHONLIB) - ifdef PYODIDE_PACKAGES - echo "Skipping BLAS/LAPACK build due to PYODIDE_PACKAGES being defined." - echo "Build it manually with make -C CLAPACK if needed." - touch $(CLAPACK) - else - make -C CLAPACK - endif +ifdef PYODIDE_PACKAGES + echo "Skipping BLAS/LAPACK build due to PYODIDE_PACKAGES being defined." + echo "Build it manually with make -C CLAPACK if needed." + mkdir -p CLAPACK/CLAPACK-WA/ + touch $(CLAPACK) +else + make -C CLAPACK +endif diff --git a/test/test_common.py b/test/test_common.py index bc1141bf2..a8e6aab9b 100644 --- a/test/test_common.py +++ b/test/test_common.py @@ -49,9 +49,7 @@ def test_import(name, selenium_standalone): '{} fails to load and is not supported on {}.' .format(name, selenium_standalone.browser)) - built_packages = _parse_package_subset( - os.environ.get('PYODIDE_PACKAGES', "") - ) + built_packages = _parse_package_subset(os.environ.get('PYODIDE_PACKAGES')) # only a subset of packages were built if built_packages is not None and name not in built_packages: pytest.skip(f'{name} was skipped due to PYODIDE_PACKAGES')