[med-svn] [Git][med-team/orthanc-webviewer][master] Reduce TestDepends, fix run-unit-test script

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / orthanc-webviewer


Commits:
ece6b168 by Andreas Tille at 2023-10-25T08:47:09+02:00
Reduce TestDepends, fix run-unit-test script

- - - - -


2 changed files:

- debian/tests/control
- debian/tests/run-unit-test


Changes:

=====================================
debian/tests/control
=====================================
@@ -1,3 +1,13 @@
 Tests: run-unit-test
 Restrictions: allow-stderr
-Depends: @, cmake, libboost-all-dev, libgtest-dev, libjpeg-dev,libjs-jquery-ui, libjs-jquery-ui-theme-base, libjsoncpp-dev, liborthancframework-dev, libpng-dev, libsqlite3-dev, orthanc-dev (>= 0.9.5), unzip, uuid-dev,yui-compressor, zlib1g-dev, build-essential
+Depends: @,
+         build-essential,
+         cmake,
+         libgtest-dev,
+         libjpeg-dev,
+         libjsoncpp-dev,
+         liborthancframework-dev,
+         libpng-dev,
+         libsqlite3-dev,
+         orthanc-dev (>= 0.9.5),
+         orthanc-doc


=====================================
debian/tests/run-unit-test
=====================================
@@ -11,15 +11,18 @@ CPP=g++
 
 if [ "${AUTOPKGTEST_TMP}" = "" ] ; then
   AUTOPKGTEST_TMP=$(mktemp -d /tmp/${pkg}-test.XXXXXX)
-#  trap "rm -rf ${AUTOPKGTEST_TMP}" 0 INT QUIT ABRT PIPE TERM
+  trap "rm -rf ${AUTOPKGTEST_TMP}" 0 INT QUIT ABRT PIPE TERM
 fi
 
-cp -a /usr/share/doc/${pkg}/examples/* "${AUTOPKGTEST_TMP}"
+mkdir -p "${AUTOPKGTEST_TMP}"/UnitTestsSources
+cp -a /usr/share/doc/${pkg}/examples/* "${AUTOPKGTEST_TMP}"/UnitTestsSources
+mkdir -p "${AUTOPKGTEST_TMP}"/Resources/Orthanc
+ln -s /usr/share/doc/orthanc/OrthancPluginSamples/Common "${AUTOPKGTEST_TMP}"/Resources/Orthanc/Plugins
 
 cd "${AUTOPKGTEST_TMP}"
 find . -name "*.gz" -exec gunzip \{\} \;
+cd UnitTestsSources
 
-set -x
 sed -i 's#../Plugin/##' UnitTestsMain.cpp
 
 for cpp in $(find . -name "*.cpp") ; do
@@ -38,13 +41,10 @@ ${CPP} \
 
 ${CPP} -g -O2 -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -fcf-protection \
     -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wno-long-long -Wno-variadic-macros -Wl,-z,relro -Wl,-z,now -Wl,--as-needed \
-    $(find . -name *.o) -o UnitTests  -lpthread -lrt -ldl -Wl,-Bstatic \
+    *.o -o UnitTests  -lpthread -lrt -ldl -Wl,-Bstatic \
     -lOrthancFramework -Wl,-Bdynamic -lboost_filesystem -lboost_iostreams -lboost_locale -lboost_regex -lboost_thread \
     -ljsoncpp -lpugixml -luuid -lsqlite3 
 
-# Build upstream test
-# make UnitTests
-
 # Run upstream executable test
 ./UnitTests
 



View it on GitLab: https://salsa.debian.org/med-team/orthanc-webviewer/-/commit/ece6b168afb3a595b85003c48d3deeee77d80ad6

-- 
View it on GitLab: https://salsa.debian.org/med-team/orthanc-webviewer/-/commit/ece6b168afb3a595b85003c48d3deeee77d80ad6
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20231025/61d3383e/attachment-0001.htm>