make test pass when data are avaolable

silx-kit · Nov 30, 2023 · e580f16 · e580f16
1 parent 68da5b5
commit e580f16
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/build-deb.sh b/build-deb.sh
@@ -225,19 +225,15 @@ build_deb() {
     #handle test images
     if [ -f ../${deb_name}_${debianversion}.orig-testimages.tar.gz ]
     then
-      if [ ! -d testimages ]
-      then
-        mkdir testimages
-      fi
-      cd testimages
-      tar -xzf  ../${deb_name}_${debianversion}.orig-testimages.tar.gz
-      cd ..
+        cd ..
+        tar -xzf  ${deb_name}_${debianversion}.orig-testimages.tar.gz
+        cd -
     else
       # Disable to skip tests during build
       echo No test data
-      #export PYBUILD_DISABLE_python2=test
-      #export PYBUILD_DISABLE_python3=test
-      #export DEB_BUILD_OPTIONS=nocheck
+      export PYBUILD_DISABLE_python2=test
+      export PYBUILD_DISABLE_python3=test
+      export DEB_BUILD_OPTIONS=nocheck ${DEB_BUILD_OPTIONS} 
     fi
 
     case $debian_version in

diff --git a/package/debian12/rules b/package/debian12/rules
@@ -16,7 +16,6 @@ ALL_PYX := $(call rwildcard,src,*.pyx)
 
 override_dh_clean:
 	dh_clean
-	echo cython files ${ALL_PYX}
 	# remove the cython generated file to force rebuild
 	rm -f $(patsubst %.pyx,%.cpp,${ALL_PYX})
 	rm -f $(patsubst %.pyx,%.c,${ALL_PYX})
@@ -34,7 +33,7 @@ override_dh_install:
 	dh_install
 
 override_dh_auto_test:
-	dh_auto_test -- -s custom --test-args="env PYTHONPATH={build_dir} FREESAS_TESTDATA=testimages WITH_QT_TEST=False {interpreter} run_tests.py -v"
+	dh_auto_test -- -s custom --test-args="env PYTHONPATH={build_dir} FREESAS_TESTDATA=../testdata {interpreter} run_tests.py -v"
 
 override_dh_installdocs:
 	python3 build-doc.py