[med-svn] [Git][med-team/assembly-stats][master] 4 commits: Do not forcefully compile tests

[Nilesh Patra]

Nilesh Patra pushed to branch master at Debian Med / assembly-stats


Commits:
a6a51749 by Nilesh Patra at 2021-03-10T00:16:57+05:30
Do not forcefully compile tests

- - - - -
36ce001e by Nilesh Patra at 2021-03-10T00:17:37+05:30
Use DEB_HOST_GNU_TYPE instead of DEB_BUILD_GNU_TYPE - using the latter is never right

- - - - -
2ebb24dc by Nilesh Patra at 2021-03-10T00:23:46+05:30
Add debug flag

- - - - -
56153c72 by Nilesh Patra at 2021-03-10T00:44:08+05:30
Update changelog

- - - - -


5 changed files:

- debian/changelog
- + debian/patches/add-debug-flag.patch
- + debian/patches/do-not-test-forcefully.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+assembly-stats (1.0.1+ds-3) unstable; urgency=medium
+
+  * Team Upload.
+  [ Andreas Tille ]
+  * No publication found, Add conda-id
+
+  [ Nilesh Patra ]
+  * Do not forcefully compile tests (Closes: #984889)
+  * Use DEB_HOST_GNU_TYPE instead of DEB_BUILD_GNU_TYPE
+    (Closes: #984890)
+  * Add debug flag
+
+ -- Nilesh Patra <nilesh at debian.org>  Wed, 10 Mar 2021 00:39:38 +0530
+
 assembly-stats (1.0.1+ds-2) unstable; urgency=medium
 
   * Rules-Requires-Root: no (routine-update)


=====================================
debian/patches/add-debug-flag.patch
=====================================
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ cmake_minimum_required (VERSION 2.6)
+ project (assembly-stats)
+ 
+-set (CMAKE_CXX_FLAGS "-Wall -O3 -pthread")
++set (CMAKE_CXX_FLAGS "-Wall -g -O3 -pthread")
+ 
+ file(COPY test_files DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+ #add_subdirectory(gtest-1.7.0)


=====================================
debian/patches/do-not-test-forcefully.patch
=====================================
@@ -0,0 +1,23 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,11 +5,15 @@
+ 
+ file(COPY test_files DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+ #add_subdirectory(gtest-1.7.0)
+-enable_testing()
+-include_directories(/usr/include/gtest)
+-add_executable(runUnitTests fasta_unittest.cpp fastq_unittest.cpp filetype_unittest.cpp stats_unittest.cpp)
+-target_link_libraries(runUnitTests gtest gtest_main fasta fastq filetype stats)
+-add_test(runUnitTests runUnitTests)
++option(BUILD_TESTS "Parameter to enable/disable build time tests" ON)
++
++if(BUILD_TESTS)
++	enable_testing()
++	include_directories(/usr/include/gtest)
++	add_executable(runUnitTests fasta_unittest.cpp fastq_unittest.cpp filetype_unittest.cpp stats_unittest.cpp)
++	target_link_libraries(runUnitTests gtest gtest_main fasta fastq filetype stats)
++	add_test(runUnitTests runUnitTests)
++endif()
+ 
+ add_library(fasta fasta.cpp)
+ add_library(fastq fastq.cpp)


=====================================
debian/patches/series
=====================================
@@ -1 +1,3 @@
 use_debian_packages_gtest.patch
+do-not-test-forcefully.patch
+add-debug-flag.patch


=====================================
debian/rules
=====================================
@@ -11,5 +11,8 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 %:
 	dh $@
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DBUILD_TESTS=$(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),OFF,ON)
+
 override_dh_auto_install:
-	dh_install obj-$(DEB_BUILD_GNU_TYPE)/assembly-stats usr/bin
+	dh_install obj-$(DEB_HOST_GNU_TYPE)/assembly-stats usr/bin



View it on GitLab: https://salsa.debian.org/med-team/assembly-stats/-/compare/6a6aff1aec09b1b85d78877b2365173a80dd6c86...56153c72af84aaad6b5461792650a9050e6c5685

-- 
View it on GitLab: https://salsa.debian.org/med-team/assembly-stats/-/compare/6a6aff1aec09b1b85d78877b2365173a80dd6c86...56153c72af84aaad6b5461792650a9050e6c5685
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/20210309/9060c5b3/attachment-0001.htm>