[med-svn] [Git][med-team/orthanc-webviewer][master] 7 commits: Updated test by building upstream test

Tue Oct 24 10:03:39 BST 2023


Israel Komolehin pushed to branch master at Debian Med / orthanc-webviewer


Commits:
d2fd755d by Komolehin Israel Timilehin at 2023-10-23T21:06:15+00:00
Updated test by building upstream test

- - - - -
db854761 by Komolehin Israel Timilehin at 2023-10-23T21:09:24+00:00
Removed built upstream executable

- - - - -
2f49736e by Komolehin Israel Timilehin at 2023-10-24T08:26:54+00:00
Updated debian/tests/control

- - - - -
02693709 by Komolehin Israel Timilehin at 2023-10-24T08:27:25+00:00
Replace versions with wildcard *

- - - - -
00833bce by Komolehin Israel Timilehin at 2023-10-24T08:29:16+00:00
Removed UnitTests path

- - - - -
ea935904 by Komolehin Israel Timilehin at 2023-10-24T08:52:10+00:00
Updated changelog

- - - - -
9e4a35b7 by Komolehin Israel Timilehin at 2023-10-24T08:53:09+00:00
Updated comment

- - - - -


6 changed files:

- debian/changelog
- debian/source.lintian-overrides
- debian/source/include-binaries
- − debian/tests/UnitTests
- debian/tests/control
- debian/tests/run-upstream-test


Changes:

=====================================
debian/changelog
=====================================
@@ -12,8 +12,14 @@ orthanc-webviewer (2.8-3) UNRELEASED; urgency=medium
   * Updated source/include-binaries
   * Fixed mismatched overrides warning
   * Fixed source missing error
+  * Updated test by building upstream test within test
+  * Removed prebuilt upstream executable test
+  * Updated debian/tests/control
+  * Replace versions with wildcard *
+  * Removed UnitTests path from source
+  * Updated test comment
 
- -- Komolehin Israel Timilehin <komolehinisrael at gmail.com>  Mon, 23 Oct 2023 10:46:17 +0000
+ -- Komolehin Israel Timilehin <komolehinisrael at gmail.com>  Tue, 24 Oct 2023 08:34:29 +0000
 
 orthanc-webviewer (2.8-2) unstable; urgency=medium
 


=====================================
debian/source.lintian-overrides
=====================================
@@ -5,4 +5,3 @@ orthanc-webviewer source: source-is-missing [debian/JS/cornerstone-0.11.0/corner
 orthanc-webviewer source: source-is-missing [debian/JS/jsPanel-2.3.3/mobile-detect.js]
 orthanc-webviewer source: source-is-missing [debian/JS/pako-0.2.5/pako_inflate.js]
 orthanc-webviewer source: source-is-missing [debian/JS/jquery-ui-1.11.3/jquery-ui.js]
-orthanc-webviewer source: source-is-missing [debian/tests/UnitTests]
\ No newline at end of file


=====================================
debian/source/include-binaries
=====================================
@@ -19,4 +19,3 @@ debian/JS/cornerstone-0.11.0/cornerstone.js
 debian/JS/jquery-ui-1.11.3/jquery-ui.js
 debian/JS/jsPanel-2.3.3/mobile-detect.js
 debian/JS/pako-0.2.5/pako_inflate.js
-debian/tests/UnitTests
\ No newline at end of file


=====================================
debian/tests/UnitTests deleted
=====================================
Binary files a/debian/tests/UnitTests and /dev/null differ


=====================================
debian/tests/control
=====================================
@@ -1,2 +1,3 @@
 Tests: run-upstream-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
\ No newline at end of file


=====================================
debian/tests/run-upstream-test
=====================================
@@ -11,13 +11,42 @@ if [ "${AUTOPKGTEST_TMP}" = "" ] ; then
 fi
 
 
-cp ${CUR_DIR}/debian/tests/UnitTests* -a "${AUTOPKGTEST_TMP}"
+# cp ${CUR_DIR}/debian/tests/UnitTests* -a "${AUTOPKGTEST_TMP}"
 
+cp ${CUR_DIR}/* -a "${AUTOPKGTEST_TMP}"
 
 cd "${AUTOPKGTEST_TMP}"
 
-# Run upstream executable test
-./UnitTests
 
+# Set JS dependencies for build
+
+mkdir -p Build/javascript-libs/fonts
+mkdir -p Build/javascript-libs/images
+cp /usr/share/javascript/jquery/jquery.min.js Build/javascript-libs/jquery.js
+yui-compressor debian/JS/jquery-ui-*/jquery-ui.js > Build/javascript-libs/jquery-ui.min.js
+yui-compressor debian/JS/jquery-ui-*/jquery-ui.css > Build/javascript-libs/jquery-ui.min.css
+yui-compressor debian/JS/jquery-ui-*/jquery-ui.theme.css > Build/javascript-libs/jquery-ui.theme.min.css
+cp debian/JS/jquery-ui-*/images/* Build/javascript-libs/images
+cp debian/JS/cornerstone-0.11.0/cornerstone.js Build/javascript-libs/cornerstone.min.js
+cp debian/JS/cornerstone-0.11.0/cornerstone.css Build/javascript-libs/cornerstone.css
+yui-compressor debian/JS/jsPanel-*/jquery.jspanel.js > Build/javascript-libs/jquery.jspanel.min.js
+yui-compressor debian/JS/jsPanel-*/jquery.jspanel.css > Build/javascript-libs/jquery.jspanel.min.css
+yui-compressor debian/JS/jsPanel-*/jquery.ui.touch-punch.js > Build/javascript-libs/jquery.ui.touch-punch.min.js
+yui-compressor debian/JS/jsPanel-*/mobile-detect.js > Build/javascript-libs/mobile-detect.min.js
+cp debian/JS/jsPanel-*/images/* Build/javascript-libs/images/
+cp debian/JS/jsPanel-*/fonts/* Build/javascript-libs/fonts/
+yui-compressor debian/JS/js-url-*/url.js > Build/javascript-libs/url.min.js
+yui-compressor debian/JS/pako-*/pako_inflate.js > Build/javascript-libs/pako_inflate.min.js
+
+
+cd Build
 
+# Run cmake for build
+cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON -DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DFETCHCONTENT_FULLY_DISCONNECTED=ON "-GUnix Makefiles" -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_LIBDIR=lib/x86_64-linux-gnu -DCMAKE_SKIP_RPATH:BOOL=ON -DSTATIC_BUILD:BOOL=OFF -DSTANDALONE_BUILD:BOOL=ON -DORTHANC_FRAMEWORK_SOURCE:STRING=system -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE:BOOL=ON -DORTHANC_FRAMEWORK_USE_SHARED:BOOL=OFF "-DORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES=boost_filesystem boost_iostreams boost_locale boost_regex boost_thread jsoncpp pugixml uuid sqlite3" -DCMAKE_BUILD_TYPE=None 
+
+# Build upstream test
+make UnitTests
+
+# Run upstream executable test
+./UnitTests
 



View it on GitLab: https://salsa.debian.org/med-team/orthanc-webviewer/-/compare/bca07280cbdac9ad546019fee4b40f349154185a...9e4a35b70a72bf72091f5038af6937c70e66722a

-- 
View it on GitLab: https://salsa.debian.org/med-team/orthanc-webviewer/-/compare/bca07280cbdac9ad546019fee4b40f349154185a...9e4a35b70a72bf72091f5038af6937c70e66722a
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/20231024/3521ed15/attachment-0001.htm>
