#49 #39 #35 adding numpy-less testing for ubuntu github ci job

myselfhimself · Jun 23, 2020 · 94a7dfb · 94a7dfb
1 parent 4e9fa19
commit 94a7dfb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/cpythonpythonpackage.yml b/.github/workflows/cpythonpythonpackage.yml
@@ -35,5 +35,5 @@ jobs:
 
         bash build_tools.bash 1_clean_and_regrab_gmic_src
         bash build_tools.bash 2b_compile_debug
-        bash build_tools.bash 3_test_compiled_so
+        bash build_tools.bash 3b_test_compiled_so_no_numpy #3_test_compiled_so
         # && bash build_tools.bash 11_send_to_pypi #Note that most probably nothing will be sent to PyPI because of too modern linked libraries 
diff --git a/build_tools.bash b/build_tools.bash
@@ -166,8 +166,13 @@ function 3_test_compiled_so () {
     if ! [ -z "$1" ]; then
         PYTEST_EXPRESSION_PARAM="-k $1"
     fi
-    $PIP3 uninstall gmic -y; cd ./build/lib*$PYTHON_VERSION*/ ; LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH ; $PIP3 install -r ../../dev-requirements.txt ; pwd; ls; $PYTHON3 -m pytest ../../tests/test_gmic_py.py ../../tests/test_gmic_numpy.py $PYTEST_EXPRESSION_PARAM -vvv -rxXs || { echo "Fatal error while running pytests" ; exit 1 ; } ; cd ../..
-}    
+    TEST_FILES="${TEST_FILES:-../../tests/test_gmic_py.py ../../tests/test_gmic_numpy.py}"
+    $PIP3 uninstall gmic -y; cd ./build/lib*$PYTHON_VERSION*/ ; LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH ; $PIP3 install -r ../../dev-requirements.txt ; pwd; ls; $PYTHON3 -m pytest $TEST_FILES $PYTEST_EXPRESSION_PARAM -vvv -rxXs || { echo "Fatal error while running pytests" ; exit 1 ; } ; cd ../..
+}
+
+function 3b_test_compiled_so_no_numpy () {
+    TEST_FILES="../../tests/test_gmic_py.py" 3_test_compiled_so
+}
 
 function 31_test_compiled_so_filters_io () {
     if ! [ -f ./build/lib*$PYTHON_VERSION*/*.so ]; then